fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-02-11 06:00:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

clear pending activation checks on device removal

Browse source 
Found by Drew Moseley <dmoseley@mvista.com>
This commit is contained in:
Dan Williams 2009-02-06 15:38:09 -05:00
parent 12f20e29ff
commit ce3473dc90
1 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/NetworkManagerPolicy.c
View file

@ -860,19 +860,33 @@ static void
device_removed (NMManager *manager, NMDevice *device, gpointer user_data)
{
NMPolicy *policy = (NMPolicy *) user_data;
GSList *iter = policy->dev_signal_ids;
GSList *iter;
/* Clear any idle callbacks for this device */
iter = policy->pending_activation_checks;
while (iter) {
ActivateData *data = (ActivateData *) iter->data;
GSList *next = g_slist_next (iter);
if (data->device == device) {
g_source_remove (data->id);
g_object_unref (data->device);
g_free (data);
policy->pending_activation_checks = g_slist_delete_link (policy->pending_activation_checks, iter);
}
iter = next;
}
/* Clear any signal handlers for this device */
iter = policy->dev_signal_ids;
while (iter) {
DeviceSignalID *data = (DeviceSignalID *) iter->data;
GSList *next = g_slist_next (iter);
if (data->device == device) {
policy->dev_signal_ids = g_slist_remove_link (policy->dev_signal_ids, iter);
g_signal_handler_disconnect (data->device, data->id);
g_free (data);
g_slist_free (iter);
policy->dev_signal_ids = g_slist_delete_link (policy->dev_signal_ids, iter);
}
iter = next;
}