2007-10-16 Dan Williams <dcbw@redhat.com>

* src/nm-manager.c
		- (manager_set_wireless_enabled): don't allow wireless to be enabled
			if it's disabled in hardware; don't touch network devices while
			NM is asleep



git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@2980 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams 2007-10-16 19:30:29 +00:00
parent bebd0e38b8
commit 9f255cf493
2 changed files with 15 additions and 0 deletions

View file

@ -1,3 +1,10 @@
2007-10-16 Dan Williams <dcbw@redhat.com>
* src/nm-manager.c
- (manager_set_wireless_enabled): don't allow wireless to be enabled
if it's disabled in hardware; don't touch network devices while
NM is asleep
2007-10-16 Dan Williams <dcbw@redhat.com>
* libnm-util/nm-client.c

View file

@ -862,10 +862,18 @@ manager_set_wireless_enabled (NMManager *manager, gboolean enabled)
if (priv->wireless_enabled == enabled)
return;
/* Can't set wireless enabled if it's disabled in hardware */
if (!priv->wireless_hw_enabled && enabled)
return;
priv->wireless_enabled = enabled;
g_object_notify (G_OBJECT (manager), NM_MANAGER_WIRELESS_ENABLED);
/* Don't touch devices if asleep/networking disabled */
if (priv->sleeping)
return;
/* Tear down all wireless devices */
for (iter = priv->devices; iter; iter = iter->next) {
if (NM_IS_DEVICE_802_11_WIRELESS (iter->data)) {