network-manager-applet r815 - in trunk: . src

[dcbw svn gnome org]

Author: dcbw
Date: Fri Aug  1 20:36:05 2008
New Revision: 815
URL: http://svn.gnome.org/viewvc/network-manager-applet?rev=815&view=rev

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

	* src/applet.c
		- (nma_menu_add_devices): count unavailable and unmanaged wireless
			devices when building the menu, but not when determining whether
			to show other wireless related menu items



Modified:
   trunk/ChangeLog
   trunk/src/applet.c

Modified: trunk/src/applet.c
==============================================================================
--- trunk/src/applet.c	(original)
+++ trunk/src/applet.c	Fri Aug  1 20:36:05 2008
@@ -898,7 +898,8 @@
 {
 	const GPtrArray *temp = NULL;
 	GSList *devices = NULL, *iter = NULL;
-	gint n_wireless_devices = 0;
+	gint n_wifi_devices = 0;
+	gint n_usable_wifi_devices = 0;
 	gint n_wired_devices = 0;
 	gint n_cdma_devices = 0;
 	gint n_gsm_devices = 0;
@@ -918,10 +919,10 @@
 			continue;
 
 		if (NM_IS_DEVICE_WIFI (device)) {
+			n_wifi_devices++;
 			if (   nm_client_wireless_get_enabled (applet->nm_client)
-			    && (nm_device_get_state (device) >= NM_DEVICE_STATE_DISCONNECTED)) {
-				n_wireless_devices++;
-			}
+			    && (nm_device_get_state (device) >= NM_DEVICE_STATE_DISCONNECTED))
+				n_usable_wifi_devices++;
 		} else if (NM_IS_DEVICE_ETHERNET (device))
 			n_wired_devices++;
 		else if (NM_IS_CDMA_DEVICE (device))
@@ -930,7 +931,7 @@
 			n_gsm_devices++;
 	}
 
-	if (!n_wired_devices && !n_wireless_devices && !n_cdma_devices && !n_gsm_devices) {
+	if (!n_wired_devices && !n_wifi_devices && !n_cdma_devices && !n_gsm_devices) {
 		nma_menu_add_text_item (menu, _("No network devices available"));
 		goto out;
 	}
@@ -947,7 +948,7 @@
 			continue;
 
 		if (NM_IS_DEVICE_WIFI (device))
-			n_devices = n_wireless_devices;
+			n_devices = n_wifi_devices;
 		else if (NM_IS_DEVICE_ETHERNET (device))
 			n_devices = n_wired_devices;
 		else if (NM_IS_CDMA_DEVICE (device))
@@ -964,7 +965,11 @@
 
  out:
 	g_slist_free (devices);
-	return n_wireless_devices;
+
+	/* Return # of usable wifi devices here for correct enable/disable state
+	 * of things like Enable Wireless, "Connect to other..." and such.
+	 */
+	return n_usable_wifi_devices;
 }
 
 static int