system/NetworkManager
system/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager synced 2024-10-06 16:21:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

2008-04-15 Dan Williams <dcbw@redhat.com>

Browse source 
* libnm-glib/nm-device.c
		- (get_product_and_vendor): handle serial devices correctly
		- (nm_device_update_description): pass device to get_product_and_vendor()



git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3565 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams 2008-04-16 13:41:56 +00:00
parent a993d446d5
commit 702ad9c9a8
2 changed files with 22 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2008-04-15 Dan Williams <dcbw@redhat.com>
* libnm-glib/nm-device.c
- (get_product_and_vendor): handle serial devices correctly
- (nm_device_update_description): pass device to get_product_and_vendor()
2008-04-15 Dan Williams <dcbw@redhat.com>
Patch from Benoit Boissinot <bboissin+networkmanager@gmail.com>

24
libnm-glib/nm-device.c
View file

@ -496,7 +496,8 @@ nm_device_get_state (NMDevice *device)
}
static char *
get_product_and_vendor (DBusGConnection *connection,
get_product_and_vendor (NMDevice *device,
DBusGConnection *connection,
const char *udi,
gboolean want_origdev,
gboolean warn,
@ -539,8 +540,13 @@ get_product_and_vendor (DBusGConnection *connection,
}
if (want_origdev) {
gboolean serial = FALSE;
if (NM_IS_GSM_DEVICE (device) || NM_IS_CDMA_DEVICE (device))
serial = TRUE;
dbus_g_proxy_call (proxy, "GetPropertyString", NULL,
G_TYPE_STRING, "net.originating_device",
G_TYPE_STRING, serial ? "serial.originating_device" : "net.originating_device",
G_TYPE_INVALID,
G_TYPE_STRING, &parent,
G_TYPE_INVALID);
@ -548,7 +554,7 @@ get_product_and_vendor (DBusGConnection *connection,
if (!parent) {
/* Older HAL uses 'physical_device' */
dbus_g_proxy_call (proxy, "GetPropertyString", &err,
G_TYPE_STRING, "net.physical_device",
G_TYPE_STRING, serial ? "serial.physical_device" : "net.physical_device",
G_TYPE_INVALID,
G_TYPE_STRING, &parent,
G_TYPE_INVALID);
@ -603,9 +609,10 @@ nm_device_update_description (NMDevice *device)
connection = nm_object_get_connection (NM_OBJECT (device));
g_return_if_fail (connection != NULL);
/* First, get the originating device info */
/* First, get the udi of the originating device */
udi = nm_device_get_udi (device);
orig_dev_udi = get_product_and_vendor (connection, udi, TRUE, FALSE, &priv->product, &priv->vendor);
orig_dev_udi = get_product_and_vendor (device, connection, udi, TRUE, FALSE,
&priv->product, &priv->vendor);
/* Ignore product and vendor for the Network Interface */
if (priv->product || priv->vendor) {
@ -616,7 +623,8 @@ nm_device_update_description (NMDevice *device)
}
/* Get product and vendor off the originating device if possible */
pd_parent_udi = get_product_and_vendor (connection,
pd_parent_udi = get_product_and_vendor (device,
connection,
orig_dev_udi,
FALSE,
FALSE,
@ -629,8 +637,8 @@ nm_device_update_description (NMDevice *device)
*/
if (!priv->product || !priv->vendor) {
char *ignore;
ignore = get_product_and_vendor (connection, pd_parent_udi, FALSE, TRUE,
&priv->product, &priv->vendor);
ignore = get_product_and_vendor (device, connection, pd_parent_udi,
FALSE, TRUE, &priv->product, &priv->vendor);
g_free (ignore);
}
g_free (pd_parent_udi);