[next] telepathy-salut: Remove explicit interface lists

[Simon McVittie]

Module: telepathy-salut
Branch: next
Commit: d7373452e70cdaaaa5676bc10487669a94b4146a
URL:    http://cgit.freedesktop.org/telepathy/telepathy-salut/commit/?id=d7373452e70cdaaaa5676bc10487669a94b4146a

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Tue Apr 22 16:28:12 2014 +0100

Remove explicit interface lists

---

 src/connection.c |   16 ----------------
 src/protocol.c   |   15 ---------------
 2 files changed, 31 deletions(-)

diff --git a/src/connection.c b/src/connection.c
index 348e468..b11d7b0 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -596,21 +596,6 @@ static const gchar *interfaces [] = {
   TP_IFACE_CONNECTION_INTERFACE_SIDECARS1,
   NULL };
 
-static GPtrArray *
-get_interfaces (TpBaseConnection *base)
-{
-  GPtrArray *arr;
-  const gchar **iter;
-
-  arr = TP_BASE_CONNECTION_CLASS (
-      salut_connection_parent_class)->get_interfaces_always_present (base);
-
-  for (iter = interfaces; *iter != NULL; iter++)
-    g_ptr_array_add (arr, (gchar *) *iter);
-
-  return arr;
-}
-
 const gchar * const *
 salut_connection_get_implemented_interfaces (void)
 {
@@ -664,7 +649,6 @@ salut_connection_class_init (SalutConnectionClass *salut_connection_class)
       salut_connection_shut_down;
   tp_connection_class->start_connecting =
       salut_connection_start_connecting;
-  tp_connection_class->get_interfaces_always_present = get_interfaces;
   tp_connection_class->fill_contact_attributes =
       salut_connection_fill_contact_attributes;
 
diff --git a/src/protocol.c b/src/protocol.c
index 779ae9b..5be7250 100644
--- a/src/protocol.c
+++ b/src/protocol.c
@@ -272,20 +272,6 @@ salut_protocol_finalize (GObject *object)
     G_OBJECT_CLASS (salut_protocol_parent_class)->finalize (object);
 }
 
-static GPtrArray *
-get_interfaces_array (TpBaseProtocol *self)
-{
-  GPtrArray *interfaces;
-
-  interfaces = TP_BASE_PROTOCOL_CLASS (
-      salut_protocol_parent_class)->get_interfaces_array (self);
-
-  g_ptr_array_add (interfaces, TP_IFACE_PROTOCOL_INTERFACE_AVATARS1);
-  g_ptr_array_add (interfaces, TP_IFACE_PROTOCOL_INTERFACE_PRESENCE1);
-
-  return interfaces;
-}
-
 static void
 get_avatar_details (TpBaseProtocol *base,
     GStrv *supported_mime_types,
@@ -321,7 +307,6 @@ salut_protocol_class_init (SalutProtocolClass *klass)
   base_class->normalize_contact = normalize_contact;
   base_class->identify_account = identify_account;
   base_class->get_connection_details = get_connection_details;
-  base_class->get_interfaces_array = get_interfaces_array;
   base_class->get_avatar_details = get_avatar_details;
   base_class->get_statuses = get_presence_statuses;