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

Clarify comments and clean up some code

Browse Source 
git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3588 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams
2008-04-22 19:07:00 +00:00
parent e6a5d0be51
commit 62b25d72f0
1 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/nm-device.c
View File

@@ -1717,7 +1717,8 @@ nm_device_state_changed (NMDevice *device, NMDeviceState state)
case NM_DEVICE_STATE_UNAVAILABLE: case NM_DEVICE_STATE_UNAVAILABLE:
if (old_state == NM_DEVICE_STATE_UNMANAGED) if (old_state == NM_DEVICE_STATE_UNMANAGED)
nm_device_bring_up (device, TRUE); nm_device_bring_up (device, TRUE);
/* Fall through */ /* Fall through, so when the device needs to be deactivated due to
* eg carrier changes we actually deactivate it */
case NM_DEVICE_STATE_DISCONNECTED: case NM_DEVICE_STATE_DISCONNECTED:
if (old_state != NM_DEVICE_STATE_UNAVAILABLE) if (old_state != NM_DEVICE_STATE_UNAVAILABLE)
nm_device_interface_deactivate (NM_DEVICE_INTERFACE (device)); nm_device_interface_deactivate (NM_DEVICE_INTERFACE (device));
@@ -1766,19 +1767,20 @@ nm_device_set_managed (NMDevice *device, gboolean managed)
g_return_if_fail (NM_IS_DEVICE (device)); g_return_if_fail (NM_IS_DEVICE (device));
priv = NM_DEVICE_GET_PRIVATE (device); priv = NM_DEVICE_GET_PRIVATE (device);
if (priv->managed != managed) { if (priv->managed == managed)
priv->managed = managed; return;
nm_info ("(%s): now %s", nm_device_get_iface (device), managed ? "managed" : "unmanaged");
if (priv->start_timer) { priv->managed = managed;
g_source_remove (priv->start_timer); nm_info ("(%s): now %s", nm_device_get_iface (device), managed ? "managed" : "unmanaged");
priv->start_timer = 0;
}
g_object_notify (G_OBJECT (device), NM_DEVICE_INTERFACE_MANAGED); if (priv->start_timer) {
g_source_remove (priv->start_timer);
/* If now managed, jump to unavailable */ priv->start_timer = 0;
nm_device_state_changed (device, managed ? NM_DEVICE_STATE_UNAVAILABLE : NM_DEVICE_STATE_UNMANAGED);
} }
g_object_notify (G_OBJECT (device), NM_DEVICE_INTERFACE_MANAGED);
/* If now managed, jump to unavailable */
nm_device_state_changed (device, managed ? NM_DEVICE_STATE_UNAVAILABLE : NM_DEVICE_STATE_UNMANAGED);
} }