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.c
		- (nm_device_is_activating): work around a race between auto-activation
			and the user activating the same device that is being auto-activated



git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@2842 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams
2007-09-21 03:49:28 +00:00
parent ad904cdc49
commit 0802b101fb
2 changed files with 16 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.c
- (nm_device_is_activating): work around a race between auto-activation
and the user activating the same device that is being auto-activated
2007-09-20 Dan Williams <dcbw@redhat.com> 2007-09-20 Dan Williams <dcbw@redhat.com>
* src/nm-device-interface.c * src/nm-device-interface.c

10
src/nm-device.c
View File

@@ -1278,6 +1278,8 @@ nm_device_activate (NMDeviceInterface *device,
gboolean gboolean
nm_device_is_activating (NMDevice *device) nm_device_is_activating (NMDevice *device)
{ {
NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (device);
g_return_val_if_fail (NM_IS_DEVICE (device), FALSE); g_return_val_if_fail (NM_IS_DEVICE (device), FALSE);
switch (nm_device_get_state (device)) { switch (nm_device_get_state (device)) {
@@ -1291,6 +1293,14 @@ nm_device_is_activating (NMDevice *device)
break; break;
} }
/* There's a small race between the time when stage 1 is scheduled
* and when the device actually sets STATE_PREPARE when the activation
* handler is actually run. If there's an activation handler scheduled
* we're activating anyway.
*/
if (priv->act_source_id)
return TRUE;
return FALSE; return FALSE;
} }