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

[dcbw svn gnome org]

Author: dcbw
Date: Mon Mar 31 03:29:26 2008
New Revision: 634
URL: http://svn.gnome.org/viewvc/network-manager-applet?rev=634&view=rev

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

	* src/wireless-security/eap-method-leap.c
	  src/wireless-security/eap-method-peap.c
	  src/wireless-security/eap-method-simple.c
		- fill stuff in



Modified:
   trunk/ChangeLog
   trunk/src/wireless-security/eap-method-leap.c
   trunk/src/wireless-security/eap-method-peap.c
   trunk/src/wireless-security/eap-method-simple.c

Modified: trunk/src/wireless-security/eap-method-leap.c
==============================================================================
--- trunk/src/wireless-security/eap-method-leap.c	(original)
+++ trunk/src/wireless-security/eap-method-leap.c	Mon Mar 31 03:29:26 2008
@@ -26,6 +26,7 @@
 
 #include "eap-method.h"
 #include "wireless-security.h"
+#include "gconf-helpers.h"
 
 static void
 show_toggled_cb (GtkCheckButton *button, EAPMethod *method)
@@ -162,6 +163,20 @@
 	g_signal_connect (G_OBJECT (widget), "changed",
 	                  (GCallback) wireless_security_changed_cb,
 	                  parent);
+	/* Fill secrets, if any */
+	if (connection) {
+		GHashTable *secrets;
+		GError *error = NULL;
+		GValue *value;
+
+		secrets = nm_gconf_get_keyring_items (connection, NM_SETTING_802_1X_SETTING_NAME, &error);
+		if (secrets) {
+			value = g_hash_table_lookup (secrets, NM_SETTING_802_1X_PASSWORD);
+			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);

Modified: trunk/src/wireless-security/eap-method-peap.c
==============================================================================
--- trunk/src/wireless-security/eap-method-peap.c	(original)
+++ trunk/src/wireless-security/eap-method-peap.c	Mon Mar 31 03:29:26 2008
@@ -345,6 +345,8 @@
 	GladeXML *xml;
 	GladeXML *nag_dialog_xml;
 	GtkFileFilter *filter;
+	NMSetting8021x *s_8021x = NULL;
+	const char *filename;
 
 	g_return_val_if_fail (glade_file != NULL, NULL);
 
@@ -385,8 +387,10 @@
 	method->nag_dialog_xml = nag_dialog_xml;
 	method->sec_parent = parent;
 
-	if (connection)
+	if (connection) {
 		method->ignore_ca_cert = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (connection), NMA_CA_CERT_IGNORE_TAG));
+		s_8021x = NM_SETTING_802_1X (nm_connection_get_setting (connection, NM_TYPE_SETTING_802_1X));
+	}
 
 	widget = glade_xml_get_widget (xml, "eap_peap_ca_cert_button");
 	g_assert (widget);
@@ -398,13 +402,28 @@
 	                  parent);
 	filter = eap_method_default_file_chooser_filter_new ();
 	gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (widget), filter);
+	if (connection) {
+		filename = g_object_get_data (G_OBJECT (connection), NMA_PATH_CA_CERT_TAG);
+		if (filename)
+			gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (widget), filename);
+	}
 
 	widget = inner_auth_combo_init (method, glade_file, connection);
 	inner_auth_combo_changed_cb (widget, (gpointer) method);
 
 	widget = glade_xml_get_widget (xml, "eap_peap_version_combo");
 	g_assert (widget);
-	gtk_combo_box_set_active (GTK_COMBO_BOX (widget), 1);
+	if (s_8021x) {
+		if (s_8021x->phase1_peapver && !strcmp (s_8021x->phase1_peapver, "0"))
+			gtk_combo_box_set_active (GTK_COMBO_BOX (widget), 0);
+		else
+			gtk_combo_box_set_active (GTK_COMBO_BOX (widget), 1);
+	} else
+		gtk_combo_box_set_active (GTK_COMBO_BOX (widget), 1);
+
+	widget = glade_xml_get_widget (parent->xml, "eap_peap_anon_identity_entry");
+	if (s_8021x && s_8021x->anonymous_identity)
+		gtk_entry_set_text (GTK_ENTRY (widget), s_8021x->anonymous_identity);
 
 	return method;
 }

Modified: trunk/src/wireless-security/eap-method-simple.c
==============================================================================
--- trunk/src/wireless-security/eap-method-simple.c	(original)
+++ trunk/src/wireless-security/eap-method-simple.c	Mon Mar 31 03:29:26 2008
@@ -26,6 +26,7 @@
 
 #include "eap-method.h"
 #include "wireless-security.h"
+#include "gconf-helpers.h"
 
 static void
 show_toggled_cb (GtkCheckButton *button, EAPMethod *method)
@@ -180,6 +181,20 @@
 	g_signal_connect (G_OBJECT (widget), "changed",
 	                  (GCallback) wireless_security_changed_cb,
 	                  parent);
+	/* Fill secrets, if any */
+	if (connection) {
+		GHashTable *secrets;
+		GError *error = NULL;
+		GValue *value;
+
+		secrets = nm_gconf_get_keyring_items (connection, NM_SETTING_802_1X_SETTING_NAME, &error);
+		if (secrets) {
+			value = g_hash_table_lookup (secrets, NM_SETTING_802_1X_PASSWORD);
+			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);