NetworkManager r3573 - in trunk: . src

[dcbw svn gnome org]

Author: dcbw
Date: Thu Apr 17 23:04:34 2008
New Revision: 3573
URL: http://svn.gnome.org/viewvc/NetworkManager?rev=3573&view=rev

Log:
2008-04-17  Dan Williams  <dcbw redhat com>

	* src/nm-device.c
		- (nm_device_state_changed): do deactivation and and promotion to
			unavailable here, so that the device gets cleaned up before the
			manager runs and starts emitting signals; do the
			FAILED->DISCONNECTED transition from an idle handler rather than
			immediately to guard against recursion
		- (nm_device_deactivate_quickly, nm_device_dispose): stop the
			FAILED->DISCONNECTED handler if it's scheduled



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

Modified: trunk/src/nm-device.c
==============================================================================
--- trunk/src/nm-device.c	(original)
+++ trunk/src/nm-device.c	Thu Apr 17 23:04:34 2008
@@ -63,6 +63,7 @@
 	guint		start_timer;
 
 	NMDeviceState state;
+	guint         failed_to_disconnected_id;
 
 	char *			udi;
 	char *			iface;   /* may change, could be renamed by user */
@@ -1014,6 +1015,11 @@
 		priv->act_source_id = 0;
 	}
 
+	if (priv->failed_to_disconnected_id) {
+		g_source_remove (priv->failed_to_disconnected_id);
+		priv->failed_to_disconnected_id = 0;
+	}
+
 	/* Stop any ongoing DHCP transaction on this device */
 	if (nm_device_get_act_request (self) && nm_device_get_use_dhcp (self)) {
 		nm_dhcp_manager_cancel_transaction (priv->dhcp_manager, nm_device_get_iface (self));
@@ -1548,12 +1554,17 @@
 	if (self->priv->dispose_has_run || !self->priv->initialized)
 		goto out;
 
+	self->priv->dispose_has_run = TRUE;
+
 	if (self->priv->start_timer) {
 		g_source_remove (self->priv->start_timer);
 		self->priv->start_timer = 0;
 	}
 
-	self->priv->dispose_has_run = TRUE;
+	if (self->priv->failed_to_disconnected_id) {
+		g_source_remove (self->priv->failed_to_disconnected_id);
+		self->priv->failed_to_disconnected_id = 0;
+	}
 
 	/* 
 	 * In dispose, you are supposed to free all types referenced from this
@@ -1736,6 +1747,16 @@
 									  NM_DEVICE_INTERFACE_MANAGED);
 }
 
+static gboolean
+failed_to_disconnected (gpointer user_data)
+{
+	NMDevice *device = NM_DEVICE (user_data);
+
+	device->priv->failed_to_disconnected_id = 0;
+	nm_device_state_changed (device, NM_DEVICE_STATE_DISCONNECTED);
+	return FALSE;
+}
+
 void
 nm_device_state_changed (NMDevice *device, NMDeviceState state)
 {
@@ -1751,9 +1772,14 @@
 	old_state = device->priv->state;
 	device->priv->state = state;
 
-	g_object_notify (G_OBJECT (device), NM_DEVICE_INTERFACE_STATE);
-	g_signal_emit_by_name (device, "state-changed", state);
+	if (device->priv->failed_to_disconnected_id) {
+		g_source_remove (device->priv->failed_to_disconnected_id);
+		device->priv->failed_to_disconnected_id = 0;
+	}
 
+	/* Handle the new state here; but anything that could trigger
+	 * another state change should be done below.
+	 */
 	switch (state) {
 	case NM_DEVICE_STATE_UNAVAILABLE:
 		if (old_state == NM_DEVICE_STATE_UNMANAGED)
@@ -1763,12 +1789,20 @@
 		if (old_state != NM_DEVICE_STATE_UNAVAILABLE)
 			nm_device_interface_deactivate (NM_DEVICE_INTERFACE (device));
 		break;
+	default:
+		break;
+	}
+
+	g_object_notify (G_OBJECT (device), NM_DEVICE_INTERFACE_STATE);
+	g_signal_emit_by_name (device, "state-changed", state);
+
+	switch (state) {
 	case NM_DEVICE_STATE_ACTIVATED:
 		nm_info ("Activation (%s) successful, device activated.", iface);
 		break;
 	case NM_DEVICE_STATE_FAILED:
 		nm_info ("Activation (%s) failed.", nm_device_get_iface (device));
-		nm_device_state_changed (device, NM_DEVICE_STATE_DISCONNECTED);
+		device->priv->failed_to_disconnected_id = g_idle_add (failed_to_disconnected, device);
 		break;
 	default:
 		break;