summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2017-06-20 14:22:19 +0200
committerThomas Haller <thaller@redhat.com>2017-06-29 10:03:03 +0200
commitcafa7209185e35215faea75a0e067c2dfd9eadf6 (patch)
treef0c8ce3f9e9bee6fd1b2210761d2200ccdcc1009
parent388954c93ca98280bb3ec250f64af831cfdb5ba1 (diff)
downloadNetworkManager-cafa7209185e35215faea75a0e067c2dfd9eadf6.tar.gz
libnm: fix leaking cancellable in NMClient's name_owner_changed()
(cherry picked from commit e0ddf64522069e51025588897e6a6c7ab0dde181)
-rw-r--r--libnm/nm-client.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/libnm/nm-client.c b/libnm/nm-client.c
index eee472c998..78f26a0f56 100644
--- a/libnm/nm-client.c
+++ b/libnm/nm-client.c
@@ -2504,8 +2504,7 @@ name_owner_changed (GObject *object, GParamSpec *pspec, gpointer user_data)
if (name_owner) {
g_free (name_owner);
g_clear_object (&priv->object_manager);
- if (priv->new_object_manager_cancellable)
- g_cancellable_cancel (priv->new_object_manager_cancellable);
+ nm_clear_g_cancellable (&priv->new_object_manager_cancellable);
priv->new_object_manager_cancellable = g_cancellable_new ();
prepare_object_manager (self, priv->new_object_manager_cancellable,
new_object_manager, self);