diff --git a/ChangeLog b/ChangeLog index 792557351..3e36b510a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2007-09-11 Dan Williams + + * introspection/nm-device.xml + libnm-glib/nm-device.c + libnm-glib/nm-device.c + - Fix Activate call argument borkage; Activate takes 3 arguments + 2007-09-11 Dan Williams * libnm-glib/nm-access-point.c diff --git a/introspection/nm-device.xml b/introspection/nm-device.xml index 938f50aa2..38f3c153e 100644 --- a/introspection/nm-device.xml +++ b/introspection/nm-device.xml @@ -4,7 +4,9 @@ - + + + diff --git a/libnm-glib/nm-device.c b/libnm-glib/nm-device.c index 43009e7d0..66f673807 100644 --- a/libnm-glib/nm-device.c +++ b/libnm-glib/nm-device.c @@ -131,15 +131,21 @@ nm_device_new (DBusGConnection *connection, const char *path) } void -nm_device_activate (NMDevice *device, NMConnection *connection) +nm_device_activate (NMDevice *device, + const char *service_name, + NMConnection *connection, + const char *specific_object) { GError *err = NULL; g_return_if_fail (NM_IS_DEVICE (device)); + g_return_if_fail (service_name != NULL); g_return_if_fail (connection != NULL); if (!org_freedesktop_NetworkManager_Device_activate (NM_DEVICE_GET_PRIVATE (device)->device_proxy, + service_name, nm_connection_to_hash (connection), + specific_object, &err)) { g_warning ("Cannot activate device: %s", err->message); g_error_free (err); diff --git a/libnm-glib/nm-device.h b/libnm-glib/nm-device.h index 06b739d64..1df28037c 100644 --- a/libnm-glib/nm-device.h +++ b/libnm-glib/nm-device.h @@ -35,7 +35,9 @@ NMDevice *nm_device_new (DBusGConnection *connection, const char *path); void nm_device_activate (NMDevice *device, - NMConnection *connection); + const char *service_name, + NMConnection *connection, + const char *specific_object); void nm_device_deactivate (NMDevice *device);