[empathy/next] empathy_tp_chat_new: take a GVariant for immutable properties



commit c014dabeb696777bf3d48e96704b6f0d6a991770
Author: Simon McVittie <simon mcvittie collabora co uk>
Date:   Mon Apr 7 13:06:51 2014 +0100

    empathy_tp_chat_new: take a GVariant for immutable properties

 libempathy/empathy-client-factory.c |    5 ++---
 libempathy/empathy-tp-chat.c        |    2 +-
 libempathy/empathy-tp-chat.h        |    2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)
---
diff --git a/libempathy/empathy-client-factory.c b/libempathy/empathy-client-factory.c
index 856c925..c851375 100644
--- a/libempathy/empathy-client-factory.c
+++ b/libempathy/empathy-client-factory.c
@@ -47,12 +47,11 @@ empathy_client_factory_create_channel (TpClientFactory *factory,
 
   if (!tp_strdiff (chan_type, TP_IFACE_CHANNEL_TYPE_TEXT))
     {
-      GHashTable *asv = tp_asv_from_vardict (properties);
       EmpathyTpChat *chat;
 
-      chat = empathy_tp_chat_new (TP_CLIENT_FACTORY (factory), conn, path, asv);
+      chat = empathy_tp_chat_new (TP_CLIENT_FACTORY (factory), conn, path,
+          properties);
 
-      g_hash_table_unref (asv);
       return TP_CHANNEL (chat);
     }
 
diff --git a/libempathy/empathy-tp-chat.c b/libempathy/empathy-tp-chat.c
index 514bbde..60720fd 100644
--- a/libempathy/empathy-tp-chat.c
+++ b/libempathy/empathy-tp-chat.c
@@ -1094,7 +1094,7 @@ EmpathyTpChat *
 empathy_tp_chat_new (TpClientFactory *factory,
     TpConnection *conn,
     const gchar *object_path,
-    const GHashTable *immutable_properties)
+    GVariant *immutable_properties)
 {
   g_return_val_if_fail (TP_IS_CONNECTION (conn), NULL);
   g_return_val_if_fail (immutable_properties != NULL, NULL);
diff --git a/libempathy/empathy-tp-chat.h b/libempathy/empathy-tp-chat.h
index d0b1056..b9d22db 100644
--- a/libempathy/empathy-tp-chat.h
+++ b/libempathy/empathy-tp-chat.h
@@ -65,7 +65,7 @@ GType empathy_tp_chat_get_type (void) G_GNUC_CONST;
 EmpathyTpChat * empathy_tp_chat_new (TpClientFactory *factory,
     TpConnection *connection,
     const gchar *object_path,
-    const GHashTable *immutable_properties);
+    GVariant *immutable_properties);
 
 const gchar * empathy_tp_chat_get_id (EmpathyTpChat      *chat);
 EmpathyContact * empathy_tp_chat_get_remote_contact (EmpathyTpChat *chat);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]