network-manager-applet r433 - in branches/network-manager-applet-0-6: . src

[dcbw svn gnome org]

Author: dcbw
Date: Mon Jan  7 22:52:41 2008
New Revision: 433
URL: http://svn.gnome.org/viewvc/network-manager-applet?rev=433&view=rev

Log:
2008-01-07  Dan Williams  <dcbw redhat com>

	* src/applet-compat.c
		- (copy_one_wpa_private_key_password): don't convert entries that
			were already converted



Modified:
   branches/network-manager-applet-0-6/ChangeLog
   branches/network-manager-applet-0-6/src/applet-compat.c

Modified: branches/network-manager-applet-0-6/src/applet-compat.c
==============================================================================
--- branches/network-manager-applet-0-6/src/applet-compat.c	(original)
+++ branches/network-manager-applet-0-6/src/applet-compat.c	Mon Jan  7 22:52:41 2008
@@ -422,6 +422,20 @@
 	if (!temp)
 		goto out;
 
+	ret = gnome_keyring_find_itemsv_sync (GNOME_KEYRING_ITEM_GENERIC_SECRET,
+	                                      &found_list,
+	                                      "private-key-passwd",
+	                                      GNOME_KEYRING_ATTRIBUTE_TYPE_STRING,
+	                                      ssid,
+	                                      NULL);
+	/* Nothing to do if the passwords were already converted */
+	if (ret != GNOME_KEYRING_RESULT_OK)
+		goto out;
+	if (!g_list_length (found_list))
+		goto out;
+	gnome_keyring_found_list_free (found_list);
+	found_list = NULL;
+
 	/* Read private_key_passwd from keyring */
 	ret = gnome_keyring_find_itemsv_sync (GNOME_KEYRING_ITEM_GENERIC_SECRET,
 	                                      &found_list,