[network-manager-applet] applet: fix for libnm-glib activation callback changes

[Dan Williams <dcbw src gnome org>]

commit 6e71300622e0cfc4d05743fb673333b248a18ca7
Author: Dan Williams <dcbw redhat com>
Date:   Tue Mar 15 19:05:12 2011 -0500

    applet: fix for libnm-glib activation callback changes

 src/applet-device-wifi.c |    6 +++---
 src/applet.c             |   10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/src/applet-device-wifi.c b/src/applet-device-wifi.c
index 493f625..2dcf83c 100644
--- a/src/applet-device-wifi.c
+++ b/src/applet-device-wifi.c
@@ -1377,7 +1377,7 @@ nag_dialog_response_cb (GtkDialog *nag_dialog,
 
 static void
 activate_existing_cb (NMClient *client,
-                      const char *active_path,
+                      NMActiveConnection *active,
                       GError *error,
                       gpointer user_data)
 {
@@ -1388,8 +1388,8 @@ activate_existing_cb (NMClient *client,
 
 static void
 activate_new_cb (NMClient *client,
+                 NMActiveConnection *active,
                  const char *connection_path,
-                 const char *active_path,
                  GError *error,
                  gpointer user_data)
 {
@@ -1450,7 +1450,7 @@ wireless_dialog_response_cb (GtkDialog *foo,
 
 	if (fuzzy_match) {
 		nm_client_activate_connection (applet->nm_client,
-		                               nm_connection_get_path (fuzzy_match),
+		                               fuzzy_match,
 		                               device,
 		                               ap ? nm_object_get_path (NM_OBJECT (ap)) : NULL,
 		                               activate_existing_cb,
diff --git a/src/applet.c b/src/applet.c
index 9fa4832..36572a2 100644
--- a/src/applet.c
+++ b/src/applet.c
@@ -396,8 +396,8 @@ applet_item_activate_info_destroy (AppletItemActivateInfo *info)
 
 static void
 add_and_activate_cb (NMClient *client,
+                     NMActiveConnection *active,
                      const char *connection_path,
-                     const char *active_path,
                      GError *error,
                      gpointer user_data)
 {
@@ -457,7 +457,7 @@ applet_menu_item_disconnect_helper (NMDevice *device,
 
 static void
 activate_connection_cb (NMClient *client,
-                        const char *path,
+                        NMActiveConnection *active,
                         GError *error,
                         gpointer user_data)
 {
@@ -484,7 +484,7 @@ applet_menu_item_activate_helper (NMDevice *device,
 		 * NM to activate that connection.
 		 */
 		nm_client_activate_connection (applet->nm_client,
-			                           nm_connection_get_path (connection),
+			                           connection,
 			                           device,
 			                           specific_object,
 			                           activate_connection_cb,
@@ -1034,7 +1034,7 @@ typedef struct {
 
 static void
 activate_vpn_cb (NMClient *client,
-                 const char *path,
+                 NMActiveConnection *active,
                  GError *error,
                  gpointer user_data)
 {
@@ -1103,7 +1103,7 @@ nma_menu_vpn_item_clicked (GtkMenuItem *item, gpointer user_data)
 
 	/* Connection inactive, activate */
 	nm_client_activate_connection (applet->nm_client,
-	                               nm_connection_get_path (connection),
+	                               connection,
 	                               device,
 	                               nm_object_get_path (NM_OBJECT (active)),
 	                               activate_vpn_cb,