[Pkg-telepathy-commits] [telepathy-mission-control-6] 268/280: tp_client_factory_ensure_channel() now takes a GVariant as props

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian
in repository telepathy-mission-control-6.

commit f698a028242b591c05000c4f97e1b054f645cda8
Author: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
Date:   Tue Mar 18 15:40:09 2014 +0100

    tp_client_factory_ensure_channel() now takes a GVariant as props
---
 mission-control-plugins/dispatch-operation.c | 5 +++--
 src/mcd-channel.c                            | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/mission-control-plugins/dispatch-operation.c b/mission-control-plugins/dispatch-operation.c
index 7b6c592..2376460 100644
--- a/mission-control-plugins/dispatch-operation.c
+++ b/mission-control-plugins/dispatch-operation.c
@@ -412,7 +412,8 @@ mcp_dispatch_operation_find_channel_by_type (McpDispatchOperation *self,
                 mcp_dispatch_operation_ref_connection (self, client_factory);
 
               *ret_ref_channel = tp_client_factory_ensure_channel (
-                  client_factory, connection, channel_path, properties, NULL);
+                  client_factory, connection, channel_path,
+                  tp_asv_to_vardict (properties), NULL);
 
               g_object_unref (connection);
             }
@@ -496,7 +497,7 @@ mcp_dispatch_operation_ref_nth_channel (McpDispatchOperation *self,
     goto finally;
 
   channel = tp_client_factory_ensure_channel (client_factory,
-      connection, channel_path, channel_properties, NULL);
+      connection, channel_path, tp_asv_to_vardict (channel_properties), NULL);
 
 finally:
   tp_clear_object (&connection);
diff --git a/src/mcd-channel.c b/src/mcd-channel.c
index 5be3adc..0539963 100644
--- a/src/mcd-channel.c
+++ b/src/mcd-channel.c
@@ -603,7 +603,7 @@ mcd_channel_new_from_properties (TpConnection *connection,
 
     tp_chan = tp_client_factory_ensure_channel (
         tp_proxy_get_factory (connection), connection, object_path,
-        properties, &error);
+        tp_asv_to_vardict (properties), &error);
 
     if (G_UNLIKELY (error))
     {
@@ -690,7 +690,7 @@ _mcd_channel_create_proxy (McdChannel *channel, TpConnection *connection,
 
     tp_chan = tp_client_factory_ensure_channel (
         tp_proxy_get_factory (connection), connection, object_path,
-        properties, &error);
+        tp_asv_to_vardict (properties), &error);
 
     if (G_UNLIKELY (error))
     {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-telepathy/telepathy-mission-control-6.git