[network-manager-applet/NMA_0_8] Revert "core: indicate when WiFi is disabled by hardware switch (rh #533601)"



commit 57f61cf621abce837d60f33e76b14f227d3eb38c
Author: Dan Williams <dcbw redhat com>
Date:   Wed Nov 3 13:34:32 2010 -0500

    Revert "core: indicate when WiFi is disabled by hardware switch (rh #533601)"
    
    This reverts commit 3f0ecbe458efbe2e172e4c1136940228caa56028.
    
    For now

 src/applet-device-wifi.c |    7 +------
 1 files changed, 1 insertions(+), 6 deletions(-)
---
diff --git a/src/applet-device-wifi.c b/src/applet-device-wifi.c
index bf15ebb..39c2f91 100644
--- a/src/applet-device-wifi.c
+++ b/src/applet-device-wifi.c
@@ -730,7 +730,6 @@ wireless_add_menu_item (NMDevice *device,
 	NMAccessPoint *active_ap = NULL;
 	GSList *connections = NULL, *all, *iter;
 	gboolean wireless_enabled = TRUE;
-	gboolean wireless_hw_enabled = TRUE;
 	GSList *menu_items = NULL;  /* All menu items we'll be adding */
 	NMNetworkMenuItem *item, *active_item = NULL;
 	GtkWidget *widget;
@@ -781,11 +780,7 @@ wireless_add_menu_item (NMDevice *device,
 
 	/* Notify user of unmanaged or unavailable device */
 	wireless_enabled = nm_client_wireless_get_enabled (applet->nm_client);
-	wireless_hw_enabled = nm_client_wireless_hardware_get_enabled (applet->nm_client);
-	widget = nma_menu_device_get_menu_item (device, applet,
-	                                        wireless_hw_enabled ?
-	                                            (wireless_enabled ? NULL : _("wireless is disabled")) :
-	                                            _("wireless is disabled by hardware radio switch"));
+	widget = nma_menu_device_get_menu_item (device, applet, wireless_enabled ? NULL : _("wireless is disabled"));
 	if (widget) {
 		gtk_menu_shell_append (GTK_MENU_SHELL (menu), widget);
 		gtk_widget_show (widget);



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]