mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager
synced 2024-10-07 00:31:11 +00:00
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 git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3344 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
parent
d70072b20a
commit
036e09cb49
|
@ -1,3 +1,11 @@
|
|||
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
|
||||
|
||||
2008-02-25 Dan Williams <dcbw@redhat.com>
|
||||
|
||||
* libnm-glib/nm-settings.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);
|
||||
|
|
Loading…
Reference in a new issue