aboutsummaryrefslogtreecommitdiff
path: root/libmm-glib/mm-manager.c
diff options
context:
space:
mode:
authorAleksander Morgado <aleksander@aleksander.es>2018-12-04 09:55:58 +0100
committerDan Williams <dcbw@redhat.com>2018-12-04 17:26:59 +0000
commitd0bb8d1d503f2ce01ea85625294c238aa831d298 (patch)
tree8ae9acc4ee26a8b4d363b4dd60d347bcc9ba2fea /libmm-glib/mm-manager.c
parent3b743dcc362c0859958d4be5a52abb453222b3c2 (diff)
libmm-glib,manager: fix manager interface proxy creation
We were re-using the GDBusObjectManagerClientFlags set in the MMManager object as GDBusProxyFlags for the Manager1 interface proxy object, and that was completely broken. Instead of setting "DO_NOT_AUTO_START" in the proxy, we were actually setting "DO_NOT_LOAD_PROPERTIES"...
Diffstat (limited to 'libmm-glib/mm-manager.c')
-rw-r--r--libmm-glib/mm-manager.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/libmm-glib/mm-manager.c b/libmm-glib/mm-manager.c
index aa46a0e9..9276c159 100644
--- a/libmm-glib/mm-manager.c
+++ b/libmm-glib/mm-manager.c
@@ -96,7 +96,8 @@ ensure_modem_manager1_proxy (MMManager *self,
{
gchar *name = NULL;
gchar *object_path = NULL;
- GDBusProxyFlags flags = G_DBUS_PROXY_FLAGS_NONE;
+ GDBusObjectManagerClientFlags obj_manager_flags = G_DBUS_OBJECT_MANAGER_CLIENT_FLAGS_NONE;
+ GDBusProxyFlags proxy_flags = G_DBUS_PROXY_FLAGS_NONE;
GDBusConnection *connection = NULL;
if (self->priv->manager_iface_proxy)
@@ -106,13 +107,16 @@ ensure_modem_manager1_proxy (MMManager *self,
g_object_get (self,
"name", &name,
"object-path", &object_path,
- "flags", &flags,
+ "flags", &obj_manager_flags,
"connection", &connection,
NULL);
+ if (obj_manager_flags & G_DBUS_OBJECT_MANAGER_CLIENT_FLAGS_DO_NOT_AUTO_START)
+ proxy_flags |= G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START;
+
self->priv->manager_iface_proxy =
mm_gdbus_org_freedesktop_modem_manager1_proxy_new_sync (connection,
- flags,
+ proxy_flags,
name,
object_path,
NULL,