summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Müllner <fmuellner@gnome.org>2014-10-17 01:04:27 +0200
committerDan Winship <danw@gnome.org>2014-10-17 09:44:39 -0400
commit261a3924d3d375f3cf2cda056bdef224e80db68b (patch)
tree2b34aaa8b5f66eaec7e8f02e4417ba8ce0a1a988
parent2b02eea1a49a27f7cba5e9f587b6fc0f10b7260b (diff)
downloadNetworkManager-261a3924d3d375f3cf2cda056bdef224e80db68b.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).
-rw-r--r--libnm-glib/nm-remote-settings.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/libnm-glib/nm-remote-settings.c b/libnm-glib/nm-remote-settings.c
index 49d7780e6e..d9c65d773f 100644
--- a/libnm-glib/nm-remote-settings.c
+++ b/libnm-glib/nm-remote-settings.c
@@ -1363,9 +1363,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,