diff options
| author | Thomas Haller <thaller@redhat.com> | 2017-05-11 12:32:22 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2017-05-11 18:24:41 +0200 |
| commit | a08540d967812457af192ebd34497412da5d143e (patch) | |
| tree | f31175316e244816cb5ac4d1037f328ad1c3be1b /src/nm-pacrunner-manager.c | |
| parent | df137fdf9a7077c20d8923f068568c22fb479e5a (diff) | |
| download | NetworkManager-a08540d967812457af192ebd34497412da5d143e.tar.gz | |
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.
Diffstat (limited to 'src/nm-pacrunner-manager.c')
| -rw-r--r-- | src/nm-pacrunner-manager.c | 1 |
1 files changed, 0 insertions, 1 deletions
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); |