network-manager-applet r619 - in trunk: . src
- From: dcbw svn gnome org
- To: svn-commits-list gnome org
- Subject: network-manager-applet r619 - in trunk: . src
- Date: Sat, 29 Mar 2008 20:58:37 +0000 (GMT)
Author: dcbw
Date: Sat Mar 29 20:58:37 2008
New Revision: 619
URL: http://svn.gnome.org/viewvc/network-manager-applet?rev=619&view=rev
Log:
2008-03-29 Dan Williams <dcbw redhat com>
* src/wireless-dialog.c
- (security_combo_init): fix active item handling
Modified:
trunk/ChangeLog
trunk/src/wireless-dialog.c
Modified: trunk/src/wireless-dialog.c
==============================================================================
--- trunk/src/wireless-dialog.c (original)
+++ trunk/src/wireless-dialog.c Sat Mar 29 20:58:37 2008
@@ -483,24 +483,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++;
+ active = 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++;
+ active = 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++;
+ active = item;
}
}
@@ -515,8 +518,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++;
+ active = item;
}
}
@@ -527,8 +531,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++;
+ active = item;
}
}
@@ -540,8 +545,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++;
+ active = item;
}
}
@@ -553,8 +559,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++;
+ active = item;
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]