summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBeniamino Galvani <bgalvani@redhat.com>2015-07-30 14:38:36 +0200
committerBeniamino Galvani <bgalvani@redhat.com>2015-07-30 16:42:21 +0200
commitd1b6835ada12408bd415939e49a2ce8f962220ed (patch)
treea0772bb6ed1b6afa327e6429e6fbe871e21609f3
parent3e39e5b4f04aa1ad16b226ae687413d02aa5b8eb (diff)
downloadNetworkManager-d1b6835ada12408bd415939e49a2ce8f962220ed.tar.gz
settings: fix failed assertion 'owner != NULL in nm-agent-manager.c
Let NMSecretAgent emit the 'disconnected' event when dbus_owner is still valid so that receivers of the signal can query it. This fixes the following failed assertion: remove_agent: assertion 'owner != NULL' failed Fixes: 2a2fd1216b15efc6ef15ba4e49c0aa7b5969e6d7
-rw-r--r--src/settings/nm-secret-agent.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/settings/nm-secret-agent.c b/src/settings/nm-secret-agent.c
index a2b5da5795..5f659d23e7 100644
--- a/src/settings/nm-secret-agent.c
+++ b/src/settings/nm-secret-agent.c
@@ -483,9 +483,9 @@ proxy_cleanup (NMSecretAgent *self)
g_clear_object (&priv->proxy);
g_signal_handlers_disconnect_by_func (nm_bus_manager_get (), name_owner_changed_cb, self);
- g_clear_pointer (&priv->dbus_owner, g_free);
-
g_signal_emit (self, signals[DISCONNECTED], 0);
+
+ g_clear_pointer (&priv->dbus_owner, g_free);
}
}