[telepathy-mission-control/master] Use telepathy-glib for ContactCapabilities (final) and the 'ao' type

[Simon McVittie]

---
 configure.ac         |    2 +-
 src/mcd-connection.c |    6 +++---
 src/mcd-dispatcher.c |    2 +-
 src/mcd-misc.c       |   10 ----------
 src/mcd-misc.h       |    5 -----
 src/mcd.xml          |    1 -
 6 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/configure.ac b/configure.ac
index 7af3bd2..d142dc6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -287,7 +287,7 @@ PKG_CHECK_MODULES(DBUS, [dbus-1 >= 0.51, dbus-glib-1 >= 0.51], have_dbus=yes, ha
 AC_SUBST(DBUS_CFLAGS)
 AC_SUBST(DBUS_LIBS)
 
-PKG_CHECK_MODULES(TELEPATHY, telepathy-glib >= 0.7.32)
+PKG_CHECK_MODULES(TELEPATHY, telepathy-glib >= 0.7.37)
 AC_SUBST(TELEPATHY_LIBS)
 AC_SUBST(TELEPATHY_CFLAGS)
 
diff --git a/src/mcd-connection.c b/src/mcd-connection.c
index a3b536e..053dbdd 100644
--- a/src/mcd-connection.c
+++ b/src/mcd-connection.c
@@ -1448,7 +1448,7 @@ on_connection_ready (TpConnection *tp_conn, const GError *error,
     priv->has_contact_capabilities_draft1_if = tp_proxy_has_interface_by_id (tp_conn,
         MC_IFACE_QUARK_CONNECTION_INTERFACE_CONTACT_CAPABILITIES_DRAFT1);
     priv->has_contact_capabilities_if = tp_proxy_has_interface_by_id (tp_conn,
-        MC_IFACE_QUARK_CONNECTION_INTERFACE_CONTACT_CAPABILITIES);
+        TP_IFACE_QUARK_CONNECTION_INTERFACE_CONTACT_CAPABILITIES);
     priv->has_requests_if = tp_proxy_has_interface_by_id (tp_conn,
         TP_IFACE_QUARK_CONNECTION_INTERFACE_REQUESTS);
 
@@ -1507,7 +1507,7 @@ _mcd_connection_update_client_caps (McdConnection *self,
     }
 
     DEBUG ("Sending client caps to connection");
-    mc_cli_connection_interface_contact_capabilities_call_update_capabilities
+    tp_cli_connection_interface_contact_capabilities_call_update_capabilities
       (self->priv->tp_conn, -1, client_caps, NULL, NULL, NULL, NULL);
 }
 
@@ -1614,7 +1614,7 @@ mcd_connection_early_get_interfaces_cb (TpConnection *tp_conn,
                     mcd_connection_early_get_statuses_cb, NULL, NULL,
                     (GObject *) self);
             }
-            else if (q == MC_IFACE_QUARK_CONNECTION_INTERFACE_CONTACT_CAPABILITIES)
+            else if (q == TP_IFACE_QUARK_CONNECTION_INTERFACE_CONTACT_CAPABILITIES)
             {
                 GPtrArray *client_caps;
 
diff --git a/src/mcd-dispatcher.c b/src/mcd-dispatcher.c
index d21c7a3..6eb7b89 100644
--- a/src/mcd-dispatcher.c
+++ b/src/mcd-dispatcher.c
@@ -2340,7 +2340,7 @@ handler_get_all_cb (TpProxy *proxy,
                                                  G_TYPE_STRV));
 
     channels = tp_asv_get_boxed (properties, "HandledChannels",
-                                 MC_ARRAY_TYPE_OBJECT);
+                                 TP_ARRAY_TYPE_OBJECT_PATH_LIST);
 
     unique_name = _mcd_client_proxy_get_unique_name (client_proxy);
 
diff --git a/src/mcd-misc.c b/src/mcd-misc.c
index 7f7f41c..9ef33f7 100644
--- a/src/mcd-misc.c
+++ b/src/mcd-misc.c
@@ -88,16 +88,6 @@ _mcd_build_error_string (const GError *error)
         return NULL;
 }
 
-GType
-_mcd_type_dbus_ao (void)
-{
-  static GType t = 0;
-
-  if (G_UNLIKELY (t == 0))
-    t = dbus_g_type_get_collection ("GPtrArray", DBUS_TYPE_G_OBJECT_PATH);
-  return t;
-}
-
 typedef struct
 {
     McdReadyCb callback;
diff --git a/src/mcd-misc.h b/src/mcd-misc.h
index 2ac6191..76c37d3 100644
--- a/src/mcd-misc.h
+++ b/src/mcd-misc.h
@@ -47,11 +47,6 @@ void _mcd_object_call_on_struct_when_ready (gpointer object, gpointer strukt,
                                             gpointer user_data);
 void _mcd_object_ready (gpointer object, GQuark quark, const GError *error);
 
-/* not exported */
-#define MC_ARRAY_TYPE_OBJECT (_mcd_type_dbus_ao ())
-G_GNUC_INTERNAL
-GType _mcd_type_dbus_ao (void);
-
 G_GNUC_INTERNAL
 gboolean _mcd_file_set_contents (const gchar *filename, const gchar *contents,
                                  gssize length, GError **error);
diff --git a/src/mcd.xml b/src/mcd.xml
index 6e8e657..4951f88 100644
--- a/src/mcd.xml
+++ b/src/mcd.xml
@@ -13,6 +13,5 @@
 <xi:include href="../xml/Account_Manager_Interface_Creation.xml"/>
 
 <xi:include href="../xml/Connection_Interface_Contact_Capabilities_Draft1.xml"/>
-<xi:include href="../xml/Connection_Interface_Contact_Capabilities.xml"/>
 
 </tp:spec>
-- 
1.5.6.5