[Telepathy-commits] [telepathy-mission-control/master] libmcclient, src: use telepathy-glib GTypes instead of MC equivalents

[Simon McVittie]

---
 libmcclient/mc-dispatch-operation.c |    2 +-
 src/mcd-channel.c                   |    4 ++--
 src/mcd-dispatch-operation.c        |    6 +++---
 src/mcd-dispatcher.c                |    2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/libmcclient/mc-dispatch-operation.c b/libmcclient/mc-dispatch-operation.c
index 108ba11..0073a16 100644
--- a/libmcclient/mc-dispatch-operation.c
+++ b/libmcclient/mc-dispatch-operation.c
@@ -169,7 +169,7 @@ update_property (gpointer key, gpointer ht_value, gpointer user_data)
         g_list_foreach (props->channels, (GFunc)mc_channel_details_free, NULL);
         g_list_free (props->channels);
         if (G_LIKELY (G_VALUE_HOLDS (value,
-                                     MC_ARRAY_TYPE_CHANNEL_DETAILS_LIST)))
+                                     TP_ARRAY_TYPE_CHANNEL_DETAILS_LIST)))
         {
             props->channels = create_channels_prop (value);
         }
diff --git a/src/mcd-channel.c b/src/mcd-channel.c
index a8479d9..a08832e 100644
--- a/src/mcd-channel.c
+++ b/src/mcd-channel.c
@@ -1178,7 +1178,7 @@ _mcd_channel_details_build_from_list (GList *channels)
 
         properties = _mcd_channel_get_immutable_properties (channel);
 
-        type = MC_STRUCT_TYPE_CHANNEL_DETAILS;
+        type = TP_STRUCT_TYPE_ACCOUNT_DETAILS;
         g_value_init (&channel_val, type);
         g_value_take_boxed (&channel_val,
                             dbus_g_type_specialized_construct (type));
@@ -1205,7 +1205,7 @@ _mcd_channel_details_free (GPtrArray *channels)
     GValue value = { 0, };
 
     /* to free the array, put it into a GValue */
-    g_value_init (&value, MC_ARRAY_TYPE_CHANNEL_DETAILS_LIST);
+    g_value_init (&value, TP_ARRAY_TYPE_CHANNEL_DETAILS_LIST);
     g_value_take_boxed (&value, channels);
     g_value_unset (&value);
 }
diff --git a/src/mcd-dispatch-operation.c b/src/mcd-dispatch-operation.c
index 1af1350..40f4130 100644
--- a/src/mcd-dispatch-operation.c
+++ b/src/mcd-dispatch-operation.c
@@ -142,9 +142,9 @@ get_channels (TpSvcDBusProperties *self, const gchar *name, GValue *value)
 
         properties = _mcd_channel_get_immutable_properties (channel);
 
-        g_value_init (&channel_val, MC_STRUCT_TYPE_CHANNEL_DETAILS);
+        g_value_init (&channel_val, TP_STRUCT_TYPE_CHANNEL_DETAILS);
         g_value_take_boxed (&channel_val,
-            dbus_g_type_specialized_construct (MC_STRUCT_TYPE_CHANNEL_DETAILS));
+            dbus_g_type_specialized_construct (TP_STRUCT_TYPE_CHANNEL_DETAILS));
         dbus_g_type_struct_set (&channel_val,
                                 0, mcd_channel_get_object_path (channel),
                                 1, properties,
@@ -153,7 +153,7 @@ get_channels (TpSvcDBusProperties *self, const gchar *name, GValue *value)
         g_ptr_array_add (channel_array, g_value_get_boxed (&channel_val));
     }
 
-    g_value_init (value, MC_ARRAY_TYPE_CHANNEL_DETAILS_LIST);
+    g_value_init (value, TP_ARRAY_TYPE_CHANNEL_DETAILS_LIST);
     g_value_take_boxed (value, channel_array);
 }
 
diff --git a/src/mcd-dispatcher.c b/src/mcd-dispatcher.c
index 377b1cc..c2004fe 100644
--- a/src/mcd-dispatcher.c
+++ b/src/mcd-dispatcher.c
@@ -2404,7 +2404,7 @@ _mcd_dispatcher_add_request (McdDispatcher *dispatcher, McdAccount *account,
     g_ptr_array_add (requests,
                      _mcd_channel_get_requested_properties (channel));
     g_value_init (&v_requests, dbus_g_type_get_collection ("GPtrArray",
-         MC_HASH_TYPE_QUALIFIED_PROPERTY_VALUE_MAP));
+         TP_HASH_TYPE_QUALIFIED_PROPERTY_VALUE_MAP));
     g_value_set_static_boxed (&v_requests, requests);
     g_hash_table_insert (properties, "org.freedesktop.Telepathy.ChannelRequest"
                          ".Requests", &v_requests);
-- 
1.5.6.5