colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* introspection/nm-device.xml
	  libnm-glib/nm-device.c
	  libnm-glib/nm-device.c
		- Fix Activate call argument borkage; Activate takes 3 arguments



git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@2789 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams
2007-09-11 19:33:29 +00:00
parent 504b69874f
commit ab4aa2d752
4 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@@ -1,3 +1,10 @@
2007-09-11 Dan Williams <dcbw@redhat.com>
* 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 <dcbw@redhat.com> 2007-09-11 Dan Williams <dcbw@redhat.com>
* libnm-glib/nm-access-point.c * libnm-glib/nm-access-point.c

4
introspection/nm-device.xml
View File

@@ -4,7 +4,9 @@
<interface name="org.freedesktop.NetworkManager.Device"> <interface name="org.freedesktop.NetworkManager.Device">
<method name="Activate"> <method name="Activate">
<annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_device_activate"/> <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_device_activate"/>
<arg name="connection" type="soo" direction="in"/> <arg name="service_name" type="s" direction="in"/>
<arg name="connection" type="o" direction="in"/>
<arg name="specific_object" type="o" direction="in"/>
</method> </method>
<method name="Deactivate"> <method name="Deactivate">
<annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_device_deactivate"/> <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_device_deactivate"/>

8
libnm-glib/nm-device.c
View File

@@ -131,15 +131,21 @@ nm_device_new (DBusGConnection *connection, const char *path)
} }
void 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; GError *err = NULL;
g_return_if_fail (NM_IS_DEVICE (device)); 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 != NULL);
if (!org_freedesktop_NetworkManager_Device_activate (NM_DEVICE_GET_PRIVATE (device)->device_proxy, if (!org_freedesktop_NetworkManager_Device_activate (NM_DEVICE_GET_PRIVATE (device)->device_proxy,
service_name,
nm_connection_to_hash (connection), nm_connection_to_hash (connection),
specific_object,
&err)) { &err)) {
g_warning ("Cannot activate device: %s", err->message); g_warning ("Cannot activate device: %s", err->message);
g_error_free (err); g_error_free (err);

4
libnm-glib/nm-device.h
View File

@@ -35,7 +35,9 @@ NMDevice *nm_device_new (DBusGConnection *connection,
const char *path); const char *path);
void nm_device_activate (NMDevice *device, void nm_device_activate (NMDevice *device,
NMConnection *connection); const char *service_name,
NMConnection *connection,
const char *specific_object);
void nm_device_deactivate (NMDevice *device); void nm_device_deactivate (NMDevice *device);