[telepathy-glib/master] TpConnection: don't introspect alias flags, and remove some dead code

[Simon McVittie]

This was not, it turns out, a good idea. See TpContact or telepathy-qt4
for what we should have been doing.
---
 telepathy-glib/connection-internal.h |    2 -
 telepathy-glib/connection.c          |   54 ----------------------------------
 2 files changed, 0 insertions(+), 56 deletions(-)

diff --git a/telepathy-glib/connection-internal.h b/telepathy-glib/connection-internal.h
index 0f02b9b..8e248ee 100644
--- a/telepathy-glib/connection-internal.h
+++ b/telepathy-glib/connection-internal.h
@@ -38,8 +38,6 @@ struct _TpConnectionPrivate {
     TpConnectionStatusReason status_reason;
     GError *connection_error /* initialized statically */;
 
-    TpConnectionAliasFlags alias_flags;
-
     /* GArray of GQuark */
     GArray *contact_attribute_interfaces;
 
diff --git a/telepathy-glib/connection.c b/telepathy-glib/connection.c
index a299937..0c9305e 100644
--- a/telepathy-glib/connection.c
+++ b/telepathy-glib/connection.c
@@ -184,35 +184,6 @@ tp_connection_continue_introspection (TpConnection *self)
 }
 
 static void
-got_aliasing_flags (TpConnection *self,
-                    guint flags,
-                    const GError *error,
-                    gpointer user_data,
-                    GObject *weak_object)
-{
-  if (error == NULL)
-    {
-      DEBUG ("Introspected aliasing flags: 0x%x", flags);
-      self->priv->alias_flags = flags;
-    }
-  else
-    {
-      DEBUG ("GetAliasFlags(): %s", error->message);
-    }
-
-  tp_connection_continue_introspection (self);
-}
-
-static void
-introspect_aliasing (TpConnection *self)
-{
-  g_assert (self->priv->introspect_needed != NULL);
-
-  tp_cli_connection_interface_aliasing_call_get_alias_flags
-      (self, -1, got_aliasing_flags, NULL, NULL, NULL);
-}
-
-static void
 got_contact_attribute_interfaces (TpProxy *proxy,
                                   const GValue *value,
                                   const GError *error,
@@ -386,31 +357,6 @@ tp_connection_got_interfaces_cb (TpConnection *self,
                   func = introspect_contacts;
                   g_array_append_val (self->priv->introspect_needed, func);
                 }
-              else if (q == TP_IFACE_QUARK_CONNECTION_INTERFACE_ALIASING)
-                {
-                  /* call GetAliasFlags */
-                  func = introspect_aliasing;
-                  g_array_append_val (self->priv->introspect_needed,
-                      func);
-                }
-#if 0
-              else if (q == TP_IFACE_QUARK_CONNECTION_INTERFACE_AVATARS)
-                {
-                  /* call GetAvatarRequirements */
-                  func = introspect_avatars;
-                  g_array_append_val (self->priv->introspect_needed,
-                      func);
-                }
-              else if (q == TP_IFACE_QUARK_CONNECTION_INTERFACE_PRESENCE)
-                {
-                  /* call GetStatuses */
-                  func = introspect_presence;
-                  g_array_append_val (self->priv->introspect_needed,
-                      func);
-                }
-              /* if Privacy was stable, we'd also queue GetPrivacyModes
-               * here */
-#endif
             }
           else
             {
-- 
1.5.6.5