Commit 5112250a authored by Dan Williams's avatar Dan Williams

2005-10-11 Dan Williams <dcbw@redhat.com>

	* gnome/applet/applet-dbus-devices.c
		- (nmwa_dbus_update_device_info_from_hal), (hal_net_physdev_cb):
			We want to grab the product & vendor from net.physical_dev
			rather than info.parent.


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1018 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
parent a01d6f27
2005-10-11 Dan Williams <dcbw@redhat.com>
* gnome/applet/applet-dbus-devices.c
- (nmwa_dbus_update_device_info_from_hal), (hal_net_physdev_cb):
We want to grab the product & vendor from net.physical_dev
rather than info.parent.
2005-10-11 Dan Williams <dcbw@redhat.com>
* src/NetworkManagerDevice.c
......
......@@ -272,12 +272,12 @@ out:
/*
* hal_info_parent_cb
* hal_net_physdev_cb
*
* nmwa_dbus_update_device_info_from_hal callback
*
*/
static void hal_info_parent_cb (DBusPendingCall *pcall, void *user_data)
static void hal_net_physdev_cb (DBusPendingCall *pcall, void *user_data)
{
DBusMessage * reply;
HalInfoCBData * cb_data = (HalInfoCBData *) user_data;
......@@ -297,7 +297,7 @@ static void hal_info_parent_cb (DBusPendingCall *pcall, void *user_data)
goto out;
}
/* Grab the object path of the parent item of this "Network Interface" */
/* Grab the object path of the physical device of this "Network Interface" */
if (dbus_message_get_args (reply, NULL, DBUS_TYPE_STRING, &op, DBUS_TYPE_INVALID))
{
DBusMessage * message;
......@@ -348,7 +348,7 @@ static void nmwa_dbus_update_device_info_from_hal (NetworkDevice *dev, NMWireles
if ((message = dbus_message_new_method_call ("org.freedesktop.Hal", network_device_get_hal_udi (dev),
"org.freedesktop.Hal.Device", "GetPropertyString")))
{
const char * prop = "info.parent";
const char * prop = "net.physical_device";
dbus_message_append_args (message, DBUS_TYPE_STRING, &prop, DBUS_TYPE_INVALID);
dbus_connection_send_with_reply (applet->connection, message, &pcall, -1);
......@@ -359,7 +359,7 @@ static void nmwa_dbus_update_device_info_from_hal (NetworkDevice *dev, NMWireles
cb_data->applet = applet;
network_device_ref (dev);
cb_data->dev = dev;
dbus_pending_call_set_notify (pcall, hal_info_parent_cb, cb_data, (DBusFreeFunction) free_hal_info_cb_data);
dbus_pending_call_set_notify (pcall, hal_net_physdev_cb, cb_data, (DBusFreeFunction) free_hal_info_cb_data);
}
dbus_message_unref (message);
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment