diff options
| author | Florian Müllner <fmuellner@gnome.org> | 2014-10-17 01:04:27 +0200 |
|---|---|---|
| committer | Dan Winship <danw@gnome.org> | 2014-10-17 09:45:41 -0400 |
| commit | 6d81fd475ee7c4176f7c429fde8df4b56f174392 (patch) | |
| tree | 2acc48a96eb71b70a1e7bb129538199defa7f103 | |
| parent | 7c4a80d2ea3dfb7dc0f1e46b1c9785cdbdedf95f (diff) | |
| download | NetworkManager-6d81fd475ee7c4176f7c429fde8df4b56f174392.tar.gz | |
remote-settings: Mark service as running when using private bus
When using a private bus connection, the service is never marked
as running when settings are initialized asynchronously. Successfully
opening a socket in NM's runtime directory should already imply
a running service, so just mark it as such (as we already do in
the synchronous path).
(cherry picked from commit 261a3924d3d375f3cf2cda056bdef224e80db68b)
| -rw-r--r-- | libnm-glib/nm-remote-settings.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libnm-glib/nm-remote-settings.c b/libnm-glib/nm-remote-settings.c index 3a2a3e688e..8d283b2254 100644 --- a/libnm-glib/nm-remote-settings.c +++ b/libnm-glib/nm-remote-settings.c @@ -1365,9 +1365,10 @@ init_async (GAsyncInitable *initable, int io_priority, init_data->result = g_simple_async_result_new (G_OBJECT (initable), callback, user_data, init_async); - if (priv->private_bus) + if (priv->private_bus) { + priv->service_running = TRUE; init_get_properties (init_data); - else { + } else { /* Check if NM is running */ dbus_g_proxy_begin_call (priv->dbus_proxy, "NameHasOwner", init_async_got_manager_running, |