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

dns: when clearing "plugin" always disconnect signal handlers

Browse source 
(cherry picked from commit 83fd710005)
This commit is contained in:
Thomas Haller 2016-04-21 18:16:05 +02:00
parent b36408d882
commit 5504af286d
1 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1418,6 +1418,18 @@ nm_dns_manager_end_updates (NMDnsManager *self, const char *func)
/******************************************************************/
static void
_clear_plugin (NMDnsManager *self)
{
NMDnsManagerPrivate *priv = NM_DNS_MANAGER_GET_PRIVATE (self);
if (priv->plugin) {
g_signal_handlers_disconnect_by_func (priv->plugin, plugin_failed, self);
g_signal_handlers_disconnect_by_func (priv->plugin, plugin_child_quit, self);
g_clear_object (&priv->plugin);
}
}
static NMDnsManagerResolvConfManager
_get_resolv_conf_manager_default (void)
{
@ -1509,7 +1521,7 @@ init_resolv_conf_mode (NMDnsManager *self)
g_free (priv->last_mode);
priv->last_mode = g_strdup (mode);
priv->last_immutable = FALSE;
g_clear_object (&priv->plugin);
_clear_plugin (self);
priv->resolv_conf_mode = NM_DNS_MANAGER_RESOLV_CONF_UNMANAGED;
if (nm_streq0 (mode, "none")) {
@ -1612,11 +1624,7 @@ dispose (GObject *object)
_LOGT ("disposing");
if (priv->plugin) {
g_signal_handlers_disconnect_by_func (priv->plugin, plugin_failed, self);
g_signal_handlers_disconnect_by_func (priv->plugin, plugin_child_quit, self);
g_clear_object (&priv->plugin);
}
_clear_plugin (self);
g_clear_pointer (&priv->last_mode, g_free);