[next] telepathy-glib: connection-manager: use tp_protocol_new_vardict()
Guillaume Desmottes
gdesmott at kemper.freedesktop.org
Mon Mar 17 07:25:41 PDT 2014
Module: telepathy-glib
Branch: next
Commit: b38cd69ae6849e5d5aecb05e01a74cadffeb97fe
URL: http://cgit.freedesktop.org/telepathy/telepathy-glib/commit/?id=b38cd69ae6849e5d5aecb05e01a74cadffeb97fe
Author: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
Date: Mon Mar 3 16:04:24 2014 +0100
connection-manager: use tp_protocol_new_vardict()
---
telepathy-glib/connection-manager.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/telepathy-glib/connection-manager.c b/telepathy-glib/connection-manager.c
index 78e8066..060716f 100644
--- a/telepathy-glib/connection-manager.c
+++ b/telepathy-glib/connection-manager.c
@@ -34,6 +34,7 @@
#include <telepathy-glib/proxy-internal.h>
#include <telepathy-glib/proxy-subclass.h>
#include "telepathy-glib/util.h"
+#include "telepathy-glib/variant-util.h"
#define DEBUG_FLAG TP_DEBUG_MANAGER
#include "telepathy-glib/debug-internal.h"
@@ -380,13 +381,12 @@ tp_connection_manager_get_all_cb (TpProxy *proxy,
while (g_hash_table_iter_next (&iter, &k, &v))
{
const gchar *name = k;
- GHashTable *protocol_properties = v;
if (tp_connection_manager_check_valid_protocol_name (name, NULL))
{
- TpProtocol *proto_object = tp_protocol_new (
+ TpProtocol *proto_object = tp_protocol_new_vardict (
tp_proxy_get_dbus_daemon (self), self->priv->name, name,
- protocol_properties, NULL);
+ tp_asv_to_vardict (v), NULL);
/* tp_protocol_new can currently only fail because of
* malformed names, and we already checked for that */
@@ -627,8 +627,8 @@ tp_connection_manager_read_file (TpDBusDaemon *dbus_daemon,
if (immutables == NULL)
continue;
- proto_object = tp_protocol_new (dbus_daemon, cm_name, name,
- immutables, NULL);
+ proto_object = tp_protocol_new_vardict (dbus_daemon, cm_name, name,
+ tp_asv_to_vardict (immutables), NULL);
g_assert (proto_object != NULL);
/* steals @name */
More information about the telepathy-commits
mailing list