NetworkManager r3787 - trunk/src

[dcbw svn gnome org]

Author: dcbw
Date: Mon Jun 30 20:19:42 2008
New Revision: 3787
URL: http://svn.gnome.org/viewvc/NetworkManager?rev=3787&view=rev

Log:
Ensure transition to UNAVAILABLE when supplicant goes away

Modified:
   trunk/src/nm-device-wifi.c

Modified: trunk/src/nm-device-wifi.c
==============================================================================
--- trunk/src/nm-device-wifi.c	(original)
+++ trunk/src/nm-device-wifi.c	Mon Jun 30 20:19:42 2008
@@ -2240,10 +2240,10 @@
 		if (priv->supplicant.iface) {
 			cleanup_association_attempt (self, FALSE);
 			supplicant_interface_release (self);
-
-			if (nm_device_is_activating (dev))
-				nm_device_state_changed (dev, NM_DEVICE_STATE_UNAVAILABLE);
 		}
+
+		if (nm_device_get_state (dev) > NM_DEVICE_STATE_UNAVAILABLE)
+			nm_device_state_changed (dev, NM_DEVICE_STATE_UNAVAILABLE);
 	} else if (new_state == NM_SUPPLICANT_MANAGER_STATE_IDLE) {
 		dev_state = nm_device_get_state (dev);
 		if (    priv->enabled