summaryrefslogtreecommitdiff
path: root/libmm-glib
diff options
context:
space:
mode:
authorBen Chan <benchan@chromium.org>2012-07-30 16:46:25 -0700
committerAleksander Morgado <aleksander@lanedo.com>2012-07-31 08:54:45 +0200
commit60405ce4ff5cc8ce7d8116b2387add00465dbd49 (patch)
tree7ca355e6218d4e6492f828f138a666c8295eb302 /libmm-glib
parenta448eabb3d8c238f1f734e233edd0ca9b49b2d60 (diff)
cli,libmm-glib: set default timeout on manager DBus proxy
This patch fixes mmcli to set the default timeout on the manager proxy interface (MmGdbusOrgFreedesktopModemManager1) instead of MMManager itself. The later is not a GDBusProxy object.
Diffstat (limited to 'libmm-glib')
-rw-r--r--libmm-glib/mm-manager.c14
-rw-r--r--libmm-glib/mm-manager.h2
2 files changed, 16 insertions, 0 deletions
diff --git a/libmm-glib/mm-manager.c b/libmm-glib/mm-manager.c
index 3e5c6d02..cab08dec 100644
--- a/libmm-glib/mm-manager.c
+++ b/libmm-glib/mm-manager.c
@@ -131,6 +131,20 @@ mm_manager_new_sync (GDBusConnection *connection,
return (ret ? MM_MANAGER (ret) : NULL);
}
+/**
+ * mm_manager_get_proxy:
+ * @manager: A #MMManager.
+ *
+ * Gets the #GDBusProxy interface of the %manager.
+ *
+ * Returns: (transfer none): The #GDBusProxy interface of %manager or %NULL if the interface hasn't been created. Do not free the returned object, it is owned by @manager.
+ */
+GDBusProxy *
+mm_manager_get_proxy (MMManager *manager)
+{
+ return G_DBUS_PROXY (manager->priv->manager_iface_proxy);
+}
+
static void
set_logging_ready (MmGdbusOrgFreedesktopModemManager1 *manager_iface_proxy,
GAsyncResult *res,
diff --git a/libmm-glib/mm-manager.h b/libmm-glib/mm-manager.h
index e95257b6..0684075e 100644
--- a/libmm-glib/mm-manager.h
+++ b/libmm-glib/mm-manager.h
@@ -67,6 +67,8 @@ MMManager *mm_manager_new_sync (
GCancellable *cancellable,
GError **error);
+GDBusProxy *mm_manager_get_proxy (MMManager *manager);
+
void mm_manager_set_logging (MMManager *manager,
const gchar *level,
GCancellable *cancellable,