network-manager-applet r1007 - in branches/network-manager-applet-0-6: . editor

[tambeti svn gnome org]

Author: tambeti
Date: Tue Nov  4 07:56:59 2008
New Revision: 1007
URL: http://svn.gnome.org/viewvc/network-manager-applet?rev=1007&view=rev

Log:
2008-11-04  Tambet Ingo  <tambet gmail com>

        * editor/widget-wso-wpa-enterprise.c: Fix the bug where the
        * WPA-EAP password
        and private key password were swapped in the connection editor.



Modified:
   branches/network-manager-applet-0-6/ChangeLog
   branches/network-manager-applet-0-6/editor/widget-wso-wpa-enterprise.c

Modified: branches/network-manager-applet-0-6/editor/widget-wso-wpa-enterprise.c
==============================================================================
--- branches/network-manager-applet-0-6/editor/widget-wso-wpa-enterprise.c	(original)
+++ branches/network-manager-applet-0-6/editor/widget-wso-wpa-enterprise.c	Tue Nov  4 07:56:59 2008
@@ -141,7 +141,7 @@
 	if (!key)
 		return;
 
-	kresult = set_eap_key_in_keyring (we_data->essid_value, key);
+	kresult = set_key_in_keyring (we_data->essid_value, key);
 	if (kresult != GNOME_KEYRING_RESULT_OK) {
 		GtkWindow *parent;
 		GtkWidget *dialog;
@@ -174,7 +174,7 @@
 	if (!key)
 		return;
 
-	kresult = set_key_in_keyring (we_data->essid_value, key);
+	kresult = set_eap_key_in_keyring (we_data->essid_value, key);
 	if (kresult != GNOME_KEYRING_RESULT_OK) {
 		GtkWindow *parent;
 		GtkWidget *dialog;
@@ -367,7 +367,7 @@
 	gtk_widget_show (widget);
 
 	widget = glade_xml_get_widget (we_data->sub_xml, "wpa_eap_passwd_entry");
-	kresult = get_eap_key_from_keyring (we_data->essid_value, &key);
+	kresult = get_key_from_keyring (we_data->essid_value, &key);
 	if (key) {
 		gtk_entry_set_text (GTK_ENTRY (widget), key);
 		g_free (key);
@@ -379,7 +379,7 @@
 	gtk_widget_show (widget);
 
 	widget = glade_xml_get_widget (we_data->sub_xml, "wpa_eap_private_key_passwd_entry");
-	kresult = get_key_from_keyring (we_data->essid_value, &key);
+	kresult = get_eap_key_from_keyring (we_data->essid_value, &key);
 	if (key) {
 		gtk_entry_set_text (GTK_ENTRY (widget), key);
 		g_free (key);