From 9cda18eea2e8e7b18d928d7a3c5af3fd50861a58 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Thu, 13 Sep 2007 11:50:21 +0000 Subject: [PATCH] 2007-09-13 Dan Williams * libnm-glib/nm-device.c libnm-glib/nm-device.h - (nm_device_activate): take a connection object path rather than an NMConnection because NMConnection isn't exported over D-Bus and therefore it dbus-glib can't automatically get an object path from it git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@2801 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 8 ++++++++ libnm-glib/nm-device.c | 8 ++++---- libnm-glib/nm-device.h | 2 +- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 071113a561..4c5d373d0d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2007-09-13 Dan Williams + + * libnm-glib/nm-device.c + libnm-glib/nm-device.h + - (nm_device_activate): take a connection object path rather than an + NMConnection because NMConnection isn't exported over D-Bus and + therefore it dbus-glib can't automatically get an object path from it + 2007-09-13 Dan Williams * libnm-util/nm-setting.c diff --git a/libnm-glib/nm-device.c b/libnm-glib/nm-device.c index 66f673807b..7273e6aa9a 100644 --- a/libnm-glib/nm-device.c +++ b/libnm-glib/nm-device.c @@ -133,19 +133,19 @@ nm_device_new (DBusGConnection *connection, const char *path) void nm_device_activate (NMDevice *device, const char *service_name, - NMConnection *connection, + const char *connection_path, 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); + g_return_if_fail (connection_path != NULL); if (!org_freedesktop_NetworkManager_Device_activate (NM_DEVICE_GET_PRIVATE (device)->device_proxy, service_name, - nm_connection_to_hash (connection), - specific_object, + connection_path, + specific_object ? 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 1df28037cf..700fbab7cd 100644 --- a/libnm-glib/nm-device.h +++ b/libnm-glib/nm-device.h @@ -36,7 +36,7 @@ NMDevice *nm_device_new (DBusGConnection *connection, void nm_device_activate (NMDevice *device, const char *service_name, - NMConnection *connection, + const char *connection_path, const char *specific_object); void nm_device_deactivate (NMDevice *device);