fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-24 21:50:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

2005-11-02 Robert Love <rml@novell.com>

Browse source 
* gnome/applet/applet.c: When wireless is disabled, act it.  Do not
	  show a list of wireless networks or the wireless devices or the
	  "Create Wireless ..." menus.  Aside from this cosmetics, this fixes
	  a bad bug: If wireless is disabled and the user picks a wireless
	  network, NM will switch to the network, only to immediately switch
	  back, as wireless is disabled.  This also reassures people that NM
	  is not scanning (it is not -- I verified).  Fixes Novell bug #130041.


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1090 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Robert Love 2005-11-02 15:37:09 +00:00 • committed by Robert Love
parent 5db5b5a80b
commit aec2ccd0fa
2 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ChangeLog
View file

@ -1,3 +1,13 @@
2005-11-02 Robert Love <rml@novell.com>
* gnome/applet/applet.c: When wireless is disabled, act it. Do not
show a list of wireless networks or the wireless devices or the
"Create Wireless ..." menus. Aside from this cosmetics, this fixes
a bad bug: If wireless is disabled and the user picks a wireless
network, NM will switch to the network, only to immediately switch
back, as wireless is disabled. This also reassures people that NM
is not scanning (it is not -- I verified). Fixes Novell bug #130041.
2005-11-02 Christopher Aillon <caillon@redhat.com>
* gnome/applet/applet.c:

14
gnome/applet/applet.c
View file

@ -1496,8 +1496,14 @@ static void nmwa_menu_add_device_item (GtkWidget *menu, NetworkDevice *device, g
case DEVICE_TYPE_WIRELESS_ETHERNET:
{
NMWirelessMenuItem *item = wireless_menu_item_new ();
GtkMenuItem *gtk_item = wireless_menu_item_get_item (item);
NMWirelessMenuItem *item;
GtkMenuItem *gtk_item;
if (!applet->wireless_enabled)
break;
item = wireless_menu_item_new ();
gtk_item = wireless_menu_item_get_item (item);
wireless_menu_item_update (item, device, n_devices);
@ -1629,7 +1635,7 @@ static void nmwa_menu_device_add_networks (GtkWidget *menu, NetworkDevice *dev,
g_return_if_fail (applet != NULL);
g_return_if_fail (dev != NULL);
if (!network_device_is_wireless (dev))
if (!network_device_is_wireless (dev) || !applet->wireless_enabled)
return;
/* Check for any security */
@ -1853,7 +1859,7 @@ static void nmwa_menu_add_devices (GtkWidget *menu, NMWirelessApplet *applet)
nmwa_menu_add_dialup_menu (menu, applet);
}
if (n_wireless_interfaces > 0)
if (n_wireless_interfaces > 0 && applet->wireless_enabled)
{
/* Add the "Other wireless network..." entry */
nmwa_menu_add_separator_item (menu);