network-manager-applet r628 - in trunk: . src src/connection-editor

[dcbw svn gnome org]

Author: dcbw
Date: Mon Mar 31 00:41:49 2008
New Revision: 628
URL: http://svn.gnome.org/viewvc/network-manager-applet?rev=628&view=rev

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

	* src/wireless-dialog.c
		- (security_combo_init): fix item counting to determine default security
			type

	* src/connection-editor/page-wireless-security.c
		- (ce_page_wireless_security_new): fix item counting to determine
			default security type



Modified:
   trunk/ChangeLog
   trunk/src/connection-editor/page-wireless-security.c
   trunk/src/wireless-dialog.c

Modified: trunk/src/connection-editor/page-wireless-security.c
==============================================================================
--- trunk/src/connection-editor/page-wireless-security.c	(original)
+++ trunk/src/connection-editor/page-wireless-security.c	Mon Mar 31 00:41:49 2008
@@ -241,6 +241,7 @@
 		                    -1);
 		if (default_type == NMU_SEC_NONE)
 			active = item;
+		item++;
 	}
 
 	if (nm_utils_security_valid (NMU_SEC_STATIC_WEP, dev_caps, FALSE, is_adhoc, 0, 0, 0)) {
@@ -254,27 +255,27 @@
 		if (ws_wep) {
 			add_security_item (self, WIRELESS_SECURITY (ws_wep), sec_model,
 			                   &iter, _("WEP 128-bit Passphrase"));
-			item++;
 			if ((active < 0) && (default_type == NMU_SEC_STATIC_WEP) && (default_wep_type == WEP_KEY_TYPE_PASSPHRASE))
 				active = item;
+			item++;
 		}
 
 		ws_wep = ws_wep_key_new (glade_file, connection, WEP_KEY_TYPE_HEX);
 		if (ws_wep) {
 			add_security_item (self, WIRELESS_SECURITY (ws_wep), sec_model,
 			                   &iter, _("WEP 40/128-bit Hexadecimal"));
-			item++;
 			if ((active < 0) && (default_type == NMU_SEC_STATIC_WEP) && (default_wep_type == WEP_KEY_TYPE_HEX))
 				active = item;
+			item++;
 		}
 
 		ws_wep = ws_wep_key_new (glade_file, connection, WEP_KEY_TYPE_ASCII);
 		if (ws_wep) {
 			add_security_item (self, WIRELESS_SECURITY (ws_wep), sec_model,
 			                   &iter, _("WEP 40/128-bit ASCII"));
-			item++;
 			if ((active < 0) && (default_type == NMU_SEC_STATIC_WEP) && (default_wep_type == WEP_KEY_TYPE_ASCII))
 				active = item;
+			item++;
 		}
 	}
 
@@ -285,9 +286,9 @@
 		if (ws_leap) {
 			add_security_item (self, WIRELESS_SECURITY (ws_leap), sec_model,
 			                   &iter, _("LEAP"));
-			item++;
 			if ((active < 0) && (default_type == NMU_SEC_LEAP))
 				active = item;
+			item++;
 		}
 	}
 
@@ -298,9 +299,9 @@
 		if (ws_dynamic_wep) {
 			add_security_item (self, WIRELESS_SECURITY (ws_dynamic_wep), sec_model,
 			                   &iter, _("Dynamic WEP (802.1x)"));
-			item++;
 			if ((active < 0) && (default_type == NMU_SEC_DYNAMIC_WEP))
 				active = item;
+			item++;
 		}
 	}
 
@@ -312,9 +313,9 @@
 		if (ws_wpa_psk) {
 			add_security_item (self, WIRELESS_SECURITY (ws_wpa_psk), sec_model,
 			                   &iter, _("WPA & WPA2 Personal"));
-			item++;
 			if ((active < 0) && ((default_type == NMU_SEC_WPA_PSK) || (default_type == NMU_SEC_WPA2_PSK)))
 				active = item;
+			item++;
 		}
 	}
 
@@ -326,9 +327,9 @@
 		if (ws_wpa_eap) {
 			add_security_item (self, WIRELESS_SECURITY (ws_wpa_eap), sec_model,
 			                   &iter, _("WPA & WPA2 Enterprise"));
-			item++;
 			if ((active < 0) && ((default_type == NMU_SEC_WPA_ENTERPRISE) || (default_type == NMU_SEC_WPA2_ENTERPRISE)))
 				active = item;
+			item++;
 		}
 	}
 

Modified: trunk/src/wireless-dialog.c
==============================================================================
--- trunk/src/wireless-dialog.c	(original)
+++ trunk/src/wireless-dialog.c	Mon Mar 31 00:41:49 2008
@@ -461,6 +461,7 @@
 		                    -1);
 		if (default_type == NMU_SEC_NONE)
 			active = item;
+		item++;
 	}
 
 	/* Don't show Static WEP if both the AP and the device are capable of WPA,
@@ -474,27 +475,27 @@
 		if (ws_wep) {
 			add_security_item (dialog, WIRELESS_SECURITY (ws_wep), sec_model,
 			                   &iter, _("WEP 128-bit Passphrase"));
-			item++;
 			if ((active < 0) && (default_type == NMU_SEC_STATIC_WEP))
 				active = item;
+			item++;
 		}
 
 		ws_wep = ws_wep_key_new (glade_file, connection, WEP_KEY_TYPE_HEX);
 		if (ws_wep) {
 			add_security_item (dialog, WIRELESS_SECURITY (ws_wep), sec_model,
 			                   &iter, _("WEP 40/128-bit Hexadecimal"));
-			item++;
 			if ((active < 0) && (default_type == NMU_SEC_STATIC_WEP))
 				active = item;
+			item++;
 		}
 
 		ws_wep = ws_wep_key_new (glade_file, connection, WEP_KEY_TYPE_ASCII);
 		if (ws_wep) {
 			add_security_item (dialog, WIRELESS_SECURITY (ws_wep), sec_model,
 			                   &iter, _("WEP 40/128-bit ASCII"));
-			item++;
 			if ((active < 0) && (default_type == NMU_SEC_STATIC_WEP))
 				active = item;
+			item++;
 		}
 	}
 
@@ -509,9 +510,9 @@
 		if (ws_leap) {
 			add_security_item (dialog, WIRELESS_SECURITY (ws_leap), sec_model,
 			                   &iter, _("LEAP"));
-			item++;
 			if ((active < 0) && (default_type == NMU_SEC_LEAP))
 				active = item;
+			item++;
 		}
 	}
 
@@ -522,9 +523,9 @@
 		if (ws_dynamic_wep) {
 			add_security_item (dialog, WIRELESS_SECURITY (ws_dynamic_wep), sec_model,
 			                   &iter, _("Dynamic WEP (802.1x)"));
-			item++;
 			if ((active < 0) && (default_type == NMU_SEC_DYNAMIC_WEP))
 				active = item;
+			item++;
 		}
 	}
 
@@ -536,9 +537,9 @@
 		if (ws_wpa_psk) {
 			add_security_item (dialog, WIRELESS_SECURITY (ws_wpa_psk), sec_model,
 			                   &iter, _("WPA & WPA2 Personal"));
-			item++;
 			if ((active < 0) && ((default_type == NMU_SEC_WPA_PSK) || (default_type == NMU_SEC_WPA2_PSK)))
 				active = item;
+			item++;
 		}
 	}
 
@@ -550,9 +551,9 @@
 		if (ws_wpa_eap) {
 			add_security_item (dialog, WIRELESS_SECURITY (ws_wpa_eap), sec_model,
 			                   &iter, _("WPA & WPA2 Enterprise"));
-			item++;
 			if ((active < 0) && ((default_type == NMU_SEC_WPA_ENTERPRISE) || (default_type == NMU_SEC_WPA2_ENTERPRISE)))
 				active = item;
+			item++;
 		}
 	}