NetworkManager r3518 - in trunk: . libnm-glib

[dcbw svn gnome org]

Author: dcbw
Date: Mon Mar 31 15:47:19 2008
New Revision: 3518
URL: http://svn.gnome.org/viewvc/NetworkManager?rev=3518&view=rev

Log:
2008-03-31  Dan Williams  <dcbw redhat com>

	* libnm-glib/nm-client.c
	  libnm-glib/nm-client.h
		- (activate_cb): pass the new active connection to callback; fix
			message when no callback is specified



Modified:
   trunk/ChangeLog
   trunk/libnm-glib/nm-client.c
   trunk/libnm-glib/nm-client.h

Modified: trunk/libnm-glib/nm-client.c
==============================================================================
--- trunk/libnm-glib/nm-client.c	(original)
+++ trunk/libnm-glib/nm-client.c	Mon Mar 31 15:47:19 2008
@@ -603,18 +603,16 @@
 
 static void
 activate_cb (DBusGProxy *proxy,
-             char *active_connection,
-             GError *err,
+             char *path,
+             GError *error,
              gpointer user_data)
 {
 	ActivateDeviceInfo *info = (ActivateDeviceInfo *) user_data;
 
 	if (info->fn)
-		info->fn (info->user_data, err);
-	else
-		nm_warning ("Device activation failed: %s", err->message);
-
-	/* FIXME: Free err as well? */
+		info->fn (info->user_data, path, error);
+	else if (error)
+		nm_warning ("Device activation failed: (%d) %s", error->code, error->message);
 
 	g_slice_free (ActivateDeviceInfo, info);
 }

Modified: trunk/libnm-glib/nm-client.h
==============================================================================
--- trunk/libnm-glib/nm-client.h	(original)
+++ trunk/libnm-glib/nm-client.h	Mon Mar 31 15:47:19 2008
@@ -45,7 +45,7 @@
 const GPtrArray *nm_client_get_devices    (NMClient *client);
 NMDevice *nm_client_get_device_by_path    (NMClient *client, const char *object_path);
 
-typedef void (*NMClientActivateDeviceFn) (gpointer user_data, GError *error);
+typedef void (*NMClientActivateDeviceFn) (gpointer user_data, const char *object_path, GError *error);
 
 void nm_client_activate_connection (NMClient *client,
 						  const char *service_name,