From a08540d967812457af192ebd34497412da5d143e Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Thu, 11 May 2017 12:32:22 +0200 Subject: [PATCH] proxy: fix passing cancellable to async D-Bus operations We must not cancel pacrunner_cancellable when the D-Bus proxy is created. Instead, keep it around and use it later for the asynchronous D-Bus operations. This doesn't really matter at the moment, because the pacrunner manager is only destroyed when NetworkManager is about to terminated. That is the only time when we actually cancel the asynchronous request. Also, at that time we no longer iterate the mainloop, so the pending requests are never completed anyway. --- src/nm-pacrunner-manager.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/nm-pacrunner-manager.c b/src/nm-pacrunner-manager.c index fd3d1f8a2d..87e0a36437 100644 --- a/src/nm-pacrunner-manager.c +++ b/src/nm-pacrunner-manager.c @@ -330,7 +330,6 @@ pacrunner_proxy_cb (GObject *source, GAsyncResult *res, gpointer user_data) priv = NM_PACRUNNER_MANAGER_GET_PRIVATE (self); priv->pacrunner = proxy; - nm_clear_g_cancellable (&priv->pacrunner_cancellable); g_signal_connect (priv->pacrunner, "notify::g-name-owner", G_CALLBACK (name_owner_changed_cb), self);