2007-09-13 Dan Williams <dcbw@redhat.com>

* 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
This commit is contained in:
Dan Williams 2007-09-13 11:50:21 +00:00
parent f361475095
commit 9cda18eea2
3 changed files with 13 additions and 5 deletions

View file

@ -1,3 +1,11 @@
2007-09-13 Dan Williams <dcbw@redhat.com>
* 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 <dcbw@redhat.com>
* libnm-util/nm-setting.c

View file

@ -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);

View file

@ -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);