summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2016-05-30 13:50:11 +0200
committerThomas Haller <thaller@redhat.com>2016-06-01 12:12:18 +0200
commita920155d0bbab07332472b691212b46c75bc5537 (patch)
treea666c465ad9fd12529be4b8258e0e1259298b577
parente1d5b27c4f3be39de2affba5697982cfccf14be8 (diff)
downloadNetworkManager-a920155d0bbab07332472b691212b46c75bc5537.tar.gz
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().
-rw-r--r--src/dns-manager/nm-dns-manager.c4
1 files changed, 4 insertions, 0 deletions
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);
}