[Telepathy-commits] [telepathy-gabble/master] Caps: Use the type Requestable Channel Class

[Alban Crequy]

---
 src/connection.c            |    2 +-
 src/im-factory.c            |    5 +++--
 src/private-tubes-factory.c |    4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/connection.c b/src/connection.c
index 929b754..4b3689a 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -2581,7 +2581,7 @@ conn_contact_capabilities_fill_contact_attributes (GObject *obj,
       if (array->len > 0)
         {
           GValue *val =  tp_g_value_slice_new (
-            GABBLE_ARRAY_TYPE_ENHANCED_CONTACT_CAPABILITY_LIST);
+            TP_ARRAY_TYPE_REQUESTABLE_CHANNEL_CLASS_LIST);
 
           g_value_take_boxed (val, array);
           tp_contacts_mixin_set_contact_attribute (attributes_hash,
diff --git a/src/im-factory.c b/src/im-factory.c
index a2de3fd..b2b7b6f 100644
--- a/src/im-factory.c
+++ b/src/im-factory.c
@@ -29,6 +29,7 @@
 #include <loudmouth/loudmouth.h>
 #include <telepathy-glib/channel-manager.h>
 #include <telepathy-glib/dbus.h>
+#include <telepathy-glib/gtypes.h>
 #include <telepathy-glib/interfaces.h>
 
 #define DEBUG_FLAG GABBLE_DEBUG_IM
@@ -469,10 +470,10 @@ gabble_im_factory_get_contact_caps (GabbleCapsChannelManager *manager,
 
   g_assert (handle != 0);
 
-  g_value_init (&monster, GABBLE_STRUCT_TYPE_ENHANCED_CONTACT_CAPABILITY);
+  g_value_init (&monster, TP_STRUCT_TYPE_REQUESTABLE_CHANNEL_CLASS);
   g_value_take_boxed (&monster,
       dbus_g_type_specialized_construct (
-        GABBLE_STRUCT_TYPE_ENHANCED_CONTACT_CAPABILITY));
+        TP_STRUCT_TYPE_REQUESTABLE_CHANNEL_CLASS));
 
   fixed_properties = g_hash_table_new_full (g_str_hash, g_str_equal, NULL,
       (GDestroyNotify) tp_g_value_slice_free);
diff --git a/src/private-tubes-factory.c b/src/private-tubes-factory.c
index 7c2c07e..078011f 100644
--- a/src/private-tubes-factory.c
+++ b/src/private-tubes-factory.c
@@ -411,10 +411,10 @@ add_service_to_array (gchar *service,
 
   g_assert (type == TP_TUBE_TYPE_STREAM || type == TP_TUBE_TYPE_DBUS);
 
-  g_value_init (&monster, GABBLE_STRUCT_TYPE_ENHANCED_CONTACT_CAPABILITY);
+  g_value_init (&monster, TP_STRUCT_TYPE_REQUESTABLE_CHANNEL_CLASS);
   g_value_take_boxed (&monster,
       dbus_g_type_specialized_construct (
-        GABBLE_STRUCT_TYPE_ENHANCED_CONTACT_CAPABILITY));
+        TP_STRUCT_TYPE_REQUESTABLE_CHANNEL_CLASS));
 
   fixed_properties = g_hash_table_new_full (g_str_hash, g_str_equal, NULL,
       (GDestroyNotify) tp_g_value_slice_free);
-- 
1.5.6.5