network-manager-applet r604 - in trunk: . src

[dcbw svn gnome org]

Author: dcbw
Date: Tue Mar 18 17:36:24 2008
New Revision: 604
URL: http://svn.gnome.org/viewvc/network-manager-applet?rev=604&view=rev

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

	* src/vpn-password-dialog.c
		- (nma_vpn_request_password): handle new GetSecrets return format



Modified:
   trunk/ChangeLog
   trunk/src/vpn-password-dialog.c

Modified: trunk/src/vpn-password-dialog.c
==============================================================================
--- trunk/src/vpn-password-dialog.c	(original)
+++ trunk/src/vpn-password-dialog.c	Tue Mar 18 17:36:24 2008
@@ -265,8 +265,12 @@
 
 	if (child_status == 0) {
 		GSList *iter;
+		GHashTable *settings;
 		GHashTable *secrets;
 
+		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 */
 		secrets = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, destroy_gvalue);
 
@@ -283,8 +287,10 @@
 			g_hash_table_insert (secrets, g_strdup (iter->data), val);
 			iter = iter->next;
 		}
-		dbus_g_method_return (context, secrets);
-		g_hash_table_destroy (secrets);
+		g_hash_table_insert (settings, g_strdup (setting_name), secrets);
+
+		dbus_g_method_return (context, settings);
+		g_hash_table_destroy (settings);
 		success = TRUE;
 	} else {
 		g_set_error (&error, NM_SETTINGS_ERROR, 1,