summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Winship <danw@redhat.com>2015-04-02 09:59:02 -0400
committerDan Winship <danw@redhat.com>2015-04-02 10:06:31 -0400
commitd2a090417ff7d08cd3efa235db208db73f0e2cb6 (patch)
treea39461775b8b8b585c9151ed92d08f96daab1326
parent5414cbeb22e4101f5d684c70709ef42a7caffc42 (diff)
downloadNetworkManager-d2a090417ff7d08cd3efa235db208db73f0e2cb6.tar.gz
fixup! libnm, core: use _nm_dbus_signal_connect()
-rw-r--r--src/nm-auth-manager.c5
-rw-r--r--src/supplicant-manager/nm-supplicant-interface.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/src/nm-auth-manager.c b/src/nm-auth-manager.c
index 6df227901c..4234e79055 100644
--- a/src/nm-auth-manager.c
+++ b/src/nm-auth-manager.c
@@ -598,7 +598,10 @@ dispose (GObject *object)
g_clear_object (&priv->new_proxy_cancellable);
}
- g_clear_object (&priv->proxy);
+ if (priv->proxy) {
+ g_signal_handlers_disconnect_by_data (priv->proxy, self);
+ g_clear_object (&priv->proxy);
+ }
#endif
G_OBJECT_CLASS (nm_auth_manager_parent_class)->dispose (object);
diff --git a/src/supplicant-manager/nm-supplicant-interface.c b/src/supplicant-manager/nm-supplicant-interface.c
index dea5948eb5..b375fae485 100644
--- a/src/supplicant-manager/nm-supplicant-interface.c
+++ b/src/supplicant-manager/nm-supplicant-interface.c
@@ -1310,6 +1310,8 @@ dispose (GObject *object)
{
NMSupplicantInterfacePrivate *priv = NM_SUPPLICANT_INTERFACE_GET_PRIVATE (object);
+ if (priv->iface_proxy)
+ g_signal_handlers_disconnect_by_data (priv->iface_proxy, NM_SUPPLICANT_INTERFACE (object));
g_clear_object (&priv->iface_proxy);
if (priv->init_cancellable)