NetworkManager r3344 - in trunk: . src

[dcbw svn gnome org]

Author: dcbw
Date: Wed Feb 27 23:10:09 2008
New Revision: 3344
URL: http://svn.gnome.org/viewvc/NetworkManager?rev=3344&view=rev

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

	* src/nm-device-802-11-wireless.c
		- (device_cleanup): cleanup any association attempt that might be in
			progress
		- (nm_device_802_11_wireless_dispose): device_cleanup() already
			destroys the AP list



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

Modified: trunk/src/nm-device-802-11-wireless.c
==============================================================================
--- trunk/src/nm-device-802-11-wireless.c	(original)
+++ trunk/src/nm-device-802-11-wireless.c	Wed Feb 27 23:10:09 2008
@@ -746,6 +746,8 @@
 
 	cancel_pending_scan (self);
 
+	cleanup_association_attempt (self, TRUE);
+
 	/* Tell the supplicant to disconnect from the current AP */
 	if (priv->supplicant.iface)
 		nm_supplicant_interface_disconnect (priv->supplicant.iface);
@@ -2965,11 +2967,6 @@
 
 	priv->dispose_has_run = TRUE;
 
-	/* General cleanup, free references to other objects */
-	g_slist_foreach (self->priv->ap_list, (GFunc) g_object_unref, NULL);
-	g_slist_free (self->priv->ap_list);
-	self->priv->ap_list = NULL;
-
 	device_cleanup (self);
 
 	set_current_ap (self, NULL);