network-manager-applet r629 - in trunk: . src/wireless-security

[dcbw svn gnome org]

Author: dcbw
Date: Mon Mar 31 00:43:45 2008
New Revision: 629
URL: http://svn.gnome.org/viewvc/network-manager-applet?rev=629&view=rev

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

	* src/wireless-security/ws-wpa-psk.c
		- (ws_wpa_psk_new): fill WPA key



Modified:
   trunk/ChangeLog
   trunk/src/wireless-security/ws-wpa-psk.c

Modified: trunk/src/wireless-security/ws-wpa-psk.c
==============================================================================
--- trunk/src/wireless-security/ws-wpa-psk.c	(original)
+++ trunk/src/wireless-security/ws-wpa-psk.c	Mon Mar 31 00:43:45 2008
@@ -27,6 +27,7 @@
 #include "wireless-security.h"
 #include "utils.h"
 #include "sha1.h"
+#include "gconf-helpers.h"
 
 #define WPA_PMK_LEN 32
 
@@ -186,6 +187,21 @@
 	                  (GCallback) wireless_security_changed_cb,
 	                  sec);
 
+	/* Fill secrets, if any */
+	if (connection) {
+		GHashTable *secrets;
+		GError *error = NULL;
+		GValue *value;
+
+		secrets = nm_gconf_get_keyring_items (connection, NM_SETTING_WIRELESS_SECURITY_SETTING_NAME, &error);
+		if (secrets) {
+			value = g_hash_table_lookup (secrets, NM_SETTING_WIRELESS_SECURITY_PSK);
+			if (value)
+				gtk_entry_set_text (GTK_ENTRY (widget), g_value_get_string (value));
+			g_hash_table_destroy (secrets);
+		}
+	}
+
 	widget = glade_xml_get_widget (xml, "show_checkbutton");
 	g_assert (widget);
 	g_signal_connect (G_OBJECT (widget), "toggled",