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

[dcbw svn gnome org]

Author: dcbw
Date: Tue Apr  1 21:55:13 2008
New Revision: 641
URL: http://svn.gnome.org/viewvc/network-manager-applet?rev=641&view=rev

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

	* src/applet-compat.c
		- (copy_one_wpa_private_key_password): fix check for whether the network
			has already been 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	Tue Apr  1 21:55:13 2008
@@ -429,9 +429,7 @@
 	                                      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))
+	if ((ret == GNOME_KEYRING_RESULT_OK) && g_list_length (found_list))
 		goto out;
 	gnome_keyring_found_list_free (found_list);
 	found_list = NULL;