From 036e09cb49e10790352622e38b459c5218fe93be Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Wed, 27 Feb 2008 23:10:09 +0000 Subject: [PATCH] 2008-02-27 Dan Williams * 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 git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3344 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 8 ++++++++ src/nm-device-802-11-wireless.c | 7 ++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index bfd3396c36..bc0478d3ea 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2008-02-27 Dan Williams + + * 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 + 2008-02-25 Dan Williams * libnm-glib/nm-settings.c diff --git a/src/nm-device-802-11-wireless.c b/src/nm-device-802-11-wireless.c index b2496421ad..cbaa98a5e5 100644 --- a/src/nm-device-802-11-wireless.c +++ b/src/nm-device-802-11-wireless.c @@ -746,6 +746,8 @@ device_cleanup (NMDevice80211Wireless *self) 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 @@ nm_device_802_11_wireless_dispose (GObject *object) 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);