[telepathy-gabble/master] Use tp_asv_* to create channel classes

[Sjoerd Simons]

---
 src/media-factory.c |   36 +++++++++++++++---------------------
 1 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/src/media-factory.c b/src/media-factory.c
index 706b802..94f74c7 100644
--- a/src/media-factory.c
+++ b/src/media-factory.c
@@ -610,17 +610,14 @@ static const gchar * const anon_channel_allowed_properties[] = {
 static GHashTable *
 gabble_media_factory_streamed_media_channel_class (void)
 {
-  GHashTable *table = g_hash_table_new_full (g_str_hash, g_str_equal,
-      NULL, (GDestroyNotify) tp_g_value_slice_free);
-  GValue *value;
+  GHashTable *table = tp_asv_new (
+      TP_IFACE_CHANNEL ".TargetHandleType", G_TYPE_UINT,
+          TP_HANDLE_TYPE_CONTACT,
+      NULL);
 
-  value = tp_g_value_slice_new (G_TYPE_STRING);
-  g_value_set_static_string (value, TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA);
-  g_hash_table_insert (table, TP_IFACE_CHANNEL ".ChannelType", value);
-
-  value = tp_g_value_slice_new (G_TYPE_UINT);
-  g_value_set_uint (value, TP_HANDLE_TYPE_CONTACT);
-  g_hash_table_insert (table, TP_IFACE_CHANNEL ".TargetHandleType", value);
+  tp_asv_set_static_string (table,
+      TP_IFACE_CHANNEL ".ChannelType",
+      TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA);
 
   return table;
 }
@@ -628,17 +625,14 @@ gabble_media_factory_streamed_media_channel_class (void)
 static GHashTable *
 gabble_media_factory_call_channel_class (void)
 {
-  GHashTable *table = g_hash_table_new_full (g_str_hash, g_str_equal,
-      NULL, (GDestroyNotify) tp_g_value_slice_free);
-  GValue *value;
-
-  value = tp_g_value_slice_new (G_TYPE_STRING);
-  g_value_set_static_string (value, GABBLE_IFACE_CHANNEL_TYPE_CALL);
-  g_hash_table_insert (table, TP_IFACE_CHANNEL ".ChannelType", value);
-
-  value = tp_g_value_slice_new (G_TYPE_UINT);
-  g_value_set_uint (value, TP_HANDLE_TYPE_CONTACT);
-  g_hash_table_insert (table, TP_IFACE_CHANNEL ".TargetHandleType", value);
+  GHashTable *table = tp_asv_new (
+      TP_IFACE_CHANNEL ".TargetHandleType", G_TYPE_UINT,
+          TP_HANDLE_TYPE_CONTACT,
+      NULL);
+
+  tp_asv_set_static_string (table,
+      TP_IFACE_CHANNEL ".ChannelType",
+      GABBLE_IFACE_CHANNEL_TYPE_CALL);
 
   return table;
 }
-- 
1.5.6.5