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

[dcbw svn gnome org]

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

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

	* src/wireless-security/eap-method-ttls.c
		- (eap_method_ttls_new): fill anonymous username and CA cert



Modified:
   trunk/ChangeLog
   trunk/src/wireless-security/eap-method-ttls.c

Modified: trunk/src/wireless-security/eap-method-ttls.c
==============================================================================
--- trunk/src/wireless-security/eap-method-ttls.c	(original)
+++ trunk/src/wireless-security/eap-method-ttls.c	Mon Mar 31 03:10:20 2008
@@ -356,6 +356,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);
 
@@ -396,8 +398,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_ttls_ca_cert_button");
 	g_assert (widget);
@@ -409,6 +413,15 @@
 	                  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 = glade_xml_get_widget (parent->xml, "eap_ttls_anon_identity_entry");
+	if (s_8021x && s_8021x->anonymous_identity)
+		gtk_entry_set_text (GTK_ENTRY (widget), s_8021x->anonymous_identity);
 
 	widget = inner_auth_combo_init (method, glade_file, connection);
 	inner_auth_combo_changed_cb (widget, (gpointer) method);