From b3124f74772e85a6558c770ca4efdb190c9f5a0c Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Mon, 30 May 2016 13:50:11 +0200 Subject: [PATCH] dns: reset plugin-ratelimiting when clearing plugin 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 a920155d0bbab07332472b691212b46c75bc5537) --- src/dns-manager/nm-dns-manager.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/dns-manager/nm-dns-manager.c b/src/dns-manager/nm-dns-manager.c index 971906e083..83c86e7429 100644 --- a/src/dns-manager/nm-dns-manager.c +++ b/src/dns-manager/nm-dns-manager.c @@ -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); }