cli,libmm-glib: provide mm_manager_(peek|get)_proxy()

peek() doesn't increase the reference count of the proxy object, while get()
does it.
This commit is contained in:
Aleksander Morgado
2012-07-31 09:02:58 +02:00
parent 60405ce4ff
commit 737b6c2fc5
3 changed files with 20 additions and 5 deletions
+2 -2
View File
@@ -249,7 +249,7 @@ get_manager_ready (GObject *source,
ctx->manager = mmcli_get_manager_finish (result);
/* Setup operation timeout */
mmcli_force_operation_timeout (mm_manager_get_proxy (ctx->manager));
mmcli_force_operation_timeout (mm_manager_peek_proxy (ctx->manager));
/* Request to set log level? */
if (set_logging_str) {
@@ -331,7 +331,7 @@ mmcli_manager_run_synchronous (GDBusConnection *connection)
ctx->manager = mmcli_get_manager_sync (connection);
/* Setup operation timeout */
mmcli_force_operation_timeout (mm_manager_get_proxy (ctx->manager));
mmcli_force_operation_timeout (mm_manager_peek_proxy (ctx->manager));
/* Request to set log level? */
if (set_logging_str) {
+16 -2
View File
@@ -131,18 +131,32 @@ mm_manager_new_sync (GDBusConnection *connection,
return (ret ? MM_MANAGER (ret) : NULL);
}
/**
* mm_manager_peek_proxy:
* @manager: A #MMManager.
*
* Gets the #GDBusProxy interface of the %manager.
*
* Returns: (transfer none): The #GDBusProxy interface of %manager. Do not free the returned object, it is owned by @manager.
*/
GDBusProxy *
mm_manager_peek_proxy (MMManager *manager)
{
return G_DBUS_PROXY (manager->priv->manager_iface_proxy);
}
/**
* 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.
* Returns: (transfer full): The #GDBusProxy interface of %manager, which must be freed with g_object_unref().
*/
GDBusProxy *
mm_manager_get_proxy (MMManager *manager)
{
return G_DBUS_PROXY (manager->priv->manager_iface_proxy);
return G_DBUS_PROXY (g_object_ref (manager->priv->manager_iface_proxy));
}
static void
+2 -1
View File
@@ -67,7 +67,8 @@ MMManager *mm_manager_new_sync (
GCancellable *cancellable,
GError **error);
GDBusProxy *mm_manager_get_proxy (MMManager *manager);
GDBusProxy *mm_manager_peek_proxy (MMManager *manager);
GDBusProxy *mm_manager_get_proxy (MMManager *manager);
void mm_manager_set_logging (MMManager *manager,
const gchar *level,