summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2014-03-18 15:40:09 +0100
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2014-03-18 15:40:09 +0100
commitf698a028242b591c05000c4f97e1b054f645cda8 (patch)
tree4fe29d449babc99c8c0573c38470b75c960b8530
parent8d4e15c8ed8d612048070df8f89ec14a781217f3 (diff)
tp_client_factory_ensure_channel() now takes a GVariant as props
-rw-r--r--mission-control-plugins/dispatch-operation.c5
-rw-r--r--src/mcd-channel.c4
2 files changed, 5 insertions, 4 deletions
diff --git a/mission-control-plugins/dispatch-operation.c b/mission-control-plugins/dispatch-operation.c
index 7b6c592c..23764609 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 5be3adc4..05399635 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))
{