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

dns: reset plugin-ratelimiting when clearing plugin

Browse source 
This also fixes cancelling the timeout in dispose().
Just to be explicit, also cancel it in dispose(),
although dispose() alreay calls _clear_plugin().

(cherry picked from commit a920155d0b)
This commit is contained in:
Thomas Haller 2016-05-30 13:50:11 +02:00
parent cff8c257d3
commit b3124f7477
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/dns-manager/nm-dns-manager.c
View file

@ -1497,6 +1497,8 @@ _clear_plugin (NMDnsManager *self)
g_clear_object (&priv->plugin);
return TRUE;
}
priv->plugin_ratelimit.ts = 0;
nm_clear_g_source (&priv->plugin_ratelimit.timer);
return FALSE;
}
@ -1686,6 +1688,8 @@ dispose (GObject *object)
priv->configs = NULL;
}
nm_clear_g_source (&priv->plugin_ratelimit.timer);
G_OBJECT_CLASS (nm_dns_manager_parent_class)->dispose (object);
}