colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2007-09-20 Dan Williams <dcbw@redhat.com>

Browse Source 
* src/nm-device-interface.c
		- (impl_device_activate): until multiple active device support lands,
			ensure only one device can be active at a time



git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@2841 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams
2007-09-21 03:48:00 +00:00
parent 13a1643995
commit ad904cdc49
2 changed files with 34 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@@ -1,3 +1,9 @@
2007-09-20 Dan Williams <dcbw@redhat.com>
* src/nm-device-interface.c
- (impl_device_activate): until multiple active device support lands,
ensure only one device can be active at a time
2007-09-20 Dan Williams <dcbw@redhat.com> 2007-09-20 Dan Williams <dcbw@redhat.com>
* src/supplicant-manager/nm-supplicant-config.c * src/supplicant-manager/nm-supplicant-config.c

28
src/nm-device-interface.c
View File

@@ -2,6 +2,7 @@
#include "nm-device-interface.h" #include "nm-device-interface.h"
#include "nm-ip4-config.h" #include "nm-ip4-config.h"
#include "nm-manager.h" #include "nm-manager.h"
#include "nm-utils.h"
static gboolean impl_device_activate (NMDeviceInterface *device, static gboolean impl_device_activate (NMDeviceInterface *device,
const char *service_name, const char *service_name,
@@ -205,6 +206,33 @@ impl_device_activate (NMDeviceInterface *device,
const char *specific_object, const char *specific_object,
GError **err) GError **err)
{ {
NMManager *manager = nm_manager_get ();
NMDevice *old_dev;
GSList *iter;
// FIXME: remove when multiple active device support has landed
switch (nm_manager_get_state (manager)) {
case NM_STATE_CONNECTED:
old_dev = nm_manager_get_active_device (manager);
break;
case NM_STATE_CONNECTING:
for (iter = nm_manager_get_devices (manager); iter; iter = iter->next) {
if (nm_device_is_activating (NM_DEVICE (iter->data))) {
old_dev = NM_DEVICE (iter->data);
break;
}
}
break;
default:
break;
}
g_object_unref (manager);
nm_info ("User request for activation of %s.", nm_device_get_iface (NM_DEVICE (device)));
if (old_dev)
nm_device_interface_deactivate (NM_DEVICE_INTERFACE (old_dev));
nm_device_interface_activate (device, nm_device_interface_activate (device,
service_name, service_name,
connection_path, connection_path,