network-manager-applet r876 - trunk/src

[dcbw svn gnome org]

Author: dcbw
Date: Wed Sep  3 20:01:29 2008
New Revision: 876
URL: http://svn.gnome.org/viewvc/network-manager-applet?rev=876&view=rev

Log:
Sending the setting name is redundant for VPN secrets here

Modified:
   trunk/src/applet.c
   trunk/src/vpn-password-dialog.c
   trunk/src/vpn-password-dialog.h

Modified: trunk/src/applet.c
==============================================================================
--- trunk/src/applet.c	(original)
+++ trunk/src/applet.c	Wed Sep  3 20:01:29 2008
@@ -1829,7 +1829,7 @@
 
 	/* VPN secrets get handled a bit differently */
 	if (!strcmp (s_con->type, NM_SETTING_VPN_SETTING_NAME)) {
-		nma_vpn_request_password (NM_EXPORTED_CONNECTION (exported), setting_name, ask_user, context);
+		nma_vpn_request_password (NM_EXPORTED_CONNECTION (exported), ask_user, context);
 		return;
 	}
 

Modified: trunk/src/vpn-password-dialog.c
==============================================================================
--- trunk/src/vpn-password-dialog.c	(original)
+++ trunk/src/vpn-password-dialog.c	Wed Sep  3 20:01:29 2008
@@ -167,7 +167,6 @@
 
 gboolean
 nma_vpn_request_password (NMExportedConnection *exported,
-                          const char *setting_name,
                           gboolean retry,
                           DBusGMethodInvocation *context)
 {
@@ -284,7 +283,7 @@
 		settings = g_hash_table_new_full (g_str_hash, g_str_equal, g_free,
 		                                  (GDestroyNotify) g_hash_table_destroy);
 
-		/* Send the secret back to NM */
+		/* Send the secrets back to NM */
 		secrets = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, destroy_gvalue);
 
 		for (iter = io_user_data.lines; iter; iter = iter->next) {
@@ -300,7 +299,7 @@
 			g_hash_table_insert (secrets, g_strdup (iter->data), val);
 			iter = iter->next;
 		}
-		g_hash_table_insert (settings, g_strdup (setting_name), secrets);
+		g_hash_table_insert (settings, g_strdup (NM_SETTING_VPN_SETTING_NAME), secrets);
 
 		dbus_g_method_return (context, settings);
 		g_hash_table_destroy (settings);

Modified: trunk/src/vpn-password-dialog.h
==============================================================================
--- trunk/src/vpn-password-dialog.h	(original)
+++ trunk/src/vpn-password-dialog.h	Wed Sep  3 20:01:29 2008
@@ -27,7 +27,6 @@
 #include <nm-settings.h>
 
 gboolean nma_vpn_request_password (NMExportedConnection *exported,
-                                   const char *setting_name,
                                    gboolean retry,
                                    DBusGMethodInvocation *context);