network-manager-applet r603 - in trunk: . src/gconf-helpers

[dcbw svn gnome org]

Author: dcbw
Date: Tue Mar 18 16:45:47 2008
New Revision: 603
URL: http://svn.gnome.org/viewvc/network-manager-applet?rev=603&view=rev

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

	* src/gconf-helpers/gconf-upgrade.c
		- (try_convert_leap, nm_gconf_migrate_0_7_wireless_security): don't
			bother trying to convert already converted connections



Modified:
   trunk/ChangeLog
   trunk/src/gconf-helpers/gconf-upgrade.c

Modified: trunk/src/gconf-helpers/gconf-upgrade.c
==============================================================================
--- trunk/src/gconf-helpers/gconf-upgrade.c	(original)
+++ trunk/src/gconf-helpers/gconf-upgrade.c	Tue Mar 18 16:45:47 2008
@@ -732,6 +732,15 @@
 	GList *found_list = NULL;
 	GnomeKeyringFound *found;
 
+	if (nm_gconf_get_string_helper (client, dir,
+	                                NM_SETTING_WIRELESS_SECURITY_LEAP_USERNAME,
+	                                NM_SETTING_WIRELESS_SECURITY_SETTING_NAME,
+	                                &val)) {
+		/* Alredy converted */
+		g_free (val);
+		return TRUE;
+	}
+
 	if (!nm_gconf_get_string_helper (client, dir,
 	                                 NM_SETTING_WIRELESS_SECURITY_KEY_MGMT,
 	                                 NM_SETTING_WIRELESS_SECURITY_SETTING_NAME,
@@ -859,6 +868,7 @@
 	connections = gconf_client_all_dirs (client, GCONF_PATH_CONNECTIONS, NULL);
 	for (iter = connections; iter; iter = iter->next) {
 		char *key_mgmt = NULL;
+		GSList *eap = NULL;
 
 		if (!nm_gconf_get_string_helper (client, iter->data,
 		                                 NM_SETTING_WIRELESS_SECURITY_KEY_MGMT,
@@ -878,6 +888,16 @@
 			continue;
 
 		/* Otherwise straight 802.1x */
+		if (nm_gconf_get_stringlist_helper (client, iter->data,
+		                                NM_SETTING_802_1X_EAP,
+		                                NM_SETTING_802_1X_SETTING_NAME,
+		                                &eap)) {
+			/* Already converted */
+			g_slist_foreach (eap, (GFunc) g_free, NULL);
+			g_slist_free (eap);
+			continue;
+		}
+
 		copy_stringlist_to_8021x (client, iter->data, NM_SETTING_802_1X_EAP);
 		copy_string_to_8021x (client, iter->data, NM_SETTING_802_1X_IDENTITY);
 		copy_string_to_8021x (client, iter->data, NM_SETTING_802_1X_ANONYMOUS_IDENTITY);