Merge branches 'trivia' and 'deprecations'

Reviewed-by: Danielle Madeley <danielle.madeley@collabora.co.uk>
Bug: http://bugs.freedesktop.org/show_bug.cgi?id=22206
Bug: http://bugs.freedesktop.org/show_bug.cgi?id=27375

1 files changed, 0 insertions, 64 deletions

diff --git a/telepathy-glib/account.c b/telepathy-glib/account.c
index f675043b9..b673059ab 100644
--- a/telepathy-glib/account.c
+++ b/telepathy-glib/account.c
@@ -114,8 +114,6 @@ struct _TpAccountPrivate {
   GList *features;
   GList *callbacks;
   GArray *requested_features;
-  GArray *actual_features;
-  GArray *missing_features;
 };
 
 typedef struct {
@@ -292,9 +290,6 @@ _tp_account_become_ready (TpAccount *self,
 
   f->ready = TRUE;
 
-  if (!_tp_account_feature_in_array (feature, priv->actual_features))
-    g_array_append_val (priv->actual_features, feature);
-
   /* First, find which callbacks are satisfied and add those items
    * from the remove list. */
   l = priv->callbacks;
@@ -696,8 +691,6 @@ _tp_account_constructed (GObject *object)
   priv->features = NULL;
   priv->callbacks = NULL;
   priv->requested_features = g_array_new (TRUE, FALSE, sizeof (GQuark));
-  priv->actual_features = g_array_new (TRUE, FALSE, sizeof (GQuark));
-  priv->missing_features = g_array_new (TRUE, FALSE, sizeof (GQuark));
 
   known_features = _tp_account_get_known_features ();
 
@@ -863,8 +856,6 @@ _tp_account_finalize (GObject *object)
   priv->callbacks = NULL;
 
   g_array_free (priv->requested_features, TRUE);
-  g_array_free (priv->actual_features, TRUE);
-  g_array_free (priv->missing_features, TRUE);
 
   /* free any data held directly by the object here */
   if (G_OBJECT_CLASS (tp_account_parent_class)->finalize != NULL)
@@ -2705,61 +2696,6 @@ tp_account_prepare_finish (TpAccount *account,
   return TRUE;
 }
 
-/**
- * _tp_account_get_requested_features:
- * @account: a #TpAccount
- *
- * <!-- -->
- *
- * Returns: a 0-terminated list of features requested on @account
- *
- * Since: 0.9.0
- */
-const GQuark *
-_tp_account_get_requested_features (TpAccount *account)
-{
-  g_return_val_if_fail (TP_IS_ACCOUNT (account), NULL);
-
-  return (const GQuark *) account->priv->requested_features->data;
-}
-
-/**
- * _tp_account_get_actual_features:
- * @account: a #TpAccount
- *
- * <!-- -->
- *
- * Returns: a 0-terminated list of actual features on @account
- *
- * Since: 0.9.0
- */
-const GQuark *
-_tp_account_get_actual_features (TpAccount *account)
-{
-  g_return_val_if_fail (TP_IS_ACCOUNT (account), NULL);
-
-  return (const GQuark *) account->priv->actual_features->data;
-}
-
-/**
- * _tp_account_get_missing_features:
- * @account: a #TpAccount
- *
- * <!-- -->
- *
- * Returns: a 0-terminated list of missing features from @account
- *          that have been requested
- *
- * Since: 0.9.0
- */
-const GQuark *
-_tp_account_get_missing_features (TpAccount *account)
-{
-  g_return_val_if_fail (TP_IS_ACCOUNT (account), NULL);
-
-  return (const GQuark *) account->priv->missing_features->data;
-}
-
 static void
 set_or_free (gchar **target,
     gchar *source)