summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiří Klimeš <jklimes@redhat.com>2015-09-21 14:38:25 +0200
committerJiří Klimeš <jklimes@redhat.com>2015-09-22 08:29:50 +0200
commitb010870d8477c24e2846df4eeda81acdd00000e4 (patch)
tree665b56bdb51b992da5a250d29d499b4faa52094a
parent117fd7ef515a60cf36acce970b21915f51f1074d (diff)
downloadNetworkManager-b010870d8477c24e2846df4eeda81acdd00000e4.tar.gz
manager: cleanup NMRfkillManager in dispose()
Fixes: b15fb8641e26eb63c2d83d9dcc9510705086e2f2 (cherry picked from commit 85d7dc1a0fe15996f4194d28378e9738b53c99c4)
-rw-r--r--src/nm-manager.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/nm-manager.c b/src/nm-manager.c
index 7589053b44..40e8321406 100644
--- a/src/nm-manager.c
+++ b/src/nm-manager.c
@@ -5152,6 +5152,11 @@ dispose (GObject *object)
g_clear_object (&priv->fw_monitor);
}
+ if (priv->rfkill_mgr) {
+ g_signal_handlers_disconnect_by_func (priv->rfkill_mgr, rfkill_manager_rfkill_changed_cb, manager);
+ g_clear_object (&priv->rfkill_mgr);
+ }
+
nm_device_factory_manager_for_each_factory (_deinit_device_factory, manager);
if (priv->timestamp_update_id) {