From cafa7209185e35215faea75a0e067c2dfd9eadf6 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Tue, 20 Jun 2017 14:22:19 +0200 Subject: [PATCH] libnm: fix leaking cancellable in NMClient's name_owner_changed() (cherry picked from commit e0ddf64522069e51025588897e6a6c7ab0dde181) --- libnm/nm-client.c | 3 +-- 1 file changed, 1 insertion(+), 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);