NetworkManager r3315 - in branches/NETWORKMANAGER_0_6_0_RELEASE: . src

[dcbw svn gnome org]

Author: dcbw
Date: Tue Feb 12 23:18:33 2008
New Revision: 3315
URL: http://svn.gnome.org/viewvc/NetworkManager?rev=3315&view=rev

Log:
2008-02-12  Dan Williams  <dcbw redhat com>

	* src/nm-device-802-11-wireless.c
		- (nm_device_802_11_wireless_dispose): don't try to disconnect an
			unconnected wireless event handler



Modified:
   branches/NETWORKMANAGER_0_6_0_RELEASE/ChangeLog
   branches/NETWORKMANAGER_0_6_0_RELEASE/src/nm-device-802-11-wireless.c

Modified: branches/NETWORKMANAGER_0_6_0_RELEASE/src/nm-device-802-11-wireless.c
==============================================================================
--- branches/NETWORKMANAGER_0_6_0_RELEASE/src/nm-device-802-11-wireless.c	(original)
+++ branches/NETWORKMANAGER_0_6_0_RELEASE/src/nm-device-802-11-wireless.c	Tue Feb 12 23:18:33 2008
@@ -2997,8 +2997,10 @@
 
 	cancel_scan_results_timeout (self);
 
-	g_signal_handler_disconnect (G_OBJECT (data->netlink_monitor),
-		self->priv->wireless_event_id);
+	if (self->priv->wireless_event_id) {
+		g_signal_handler_disconnect (G_OBJECT (data->netlink_monitor),
+			self->priv->wireless_event_id);
+	}
 
 	/* Chain up to the parent class */
 	parent_class = NM_DEVICE_CLASS (g_type_class_peek_parent (klass));