[telepathy-mission-control/master] McdClientProxy: remove some transitional API that's no longer needed

[Simon McVittie]

---
 src/mcd-client-priv.h |   12 ------------
 src/mcd-client.c      |   30 +++++++++++-------------------
 2 files changed, 11 insertions(+), 31 deletions(-)

diff --git a/src/mcd-client-priv.h b/src/mcd-client-priv.h
index b06a53e..2b71eb4 100644
--- a/src/mcd-client-priv.h
+++ b/src/mcd-client-priv.h
@@ -91,8 +91,6 @@ G_GNUC_INTERNAL void _mcd_client_proxy_set_activatable (McdClientProxy *self);
 G_GNUC_INTERNAL void _mcd_client_proxy_add_interfaces (McdClientProxy *self,
     const gchar * const *interfaces);
 
-G_GNUC_INTERNAL gchar *_mcd_client_proxy_find_client_file (
-    const gchar *client_name);
 G_GNUC_INTERNAL gboolean _mcd_client_proxy_parse_client_file (
     McdClientProxy *self);
 
@@ -106,21 +104,11 @@ G_GNUC_INTERNAL gboolean _mcd_client_proxy_get_bypass_approval
     (McdClientProxy *self);
 
 G_GNUC_INTERNAL void _mcd_client_proxy_become_incapable (McdClientProxy *self);
-G_GNUC_INTERNAL void _mcd_client_proxy_take_approver_filters
-    (McdClientProxy *self, GList *filters);
-G_GNUC_INTERNAL void _mcd_client_proxy_take_observer_filters
-    (McdClientProxy *self, GList *filters);
-G_GNUC_INTERNAL void _mcd_client_proxy_take_handler_filters
-    (McdClientProxy *self, GList *filters);
 G_GNUC_INTERNAL void _mcd_client_proxy_set_bypass_approval
     (McdClientProxy *self, gboolean bypass);
 
 G_GNUC_INTERNAL void _mcd_client_proxy_add_cap_tokens (McdClientProxy *self,
     const gchar * const *cap_tokens);
-G_GNUC_INTERNAL void _mcd_client_proxy_clear_capability_tokens
-    (McdClientProxy *self);
-G_GNUC_INTERNAL TpHandleSet *_mcd_client_proxy_peek_capability_tokens
-    (McdClientProxy *self);
 
 G_GNUC_INTERNAL GValueArray *_mcd_client_proxy_dup_handler_capabilities (
     McdClientProxy *self);
diff --git a/src/mcd-client.c b/src/mcd-client.c
index 022798a..d5f6488 100644
--- a/src/mcd-client.c
+++ b/src/mcd-client.c
@@ -92,7 +92,14 @@ struct _McdClientProxyPrivate
     GList *observer_filters;
 };
 
-gchar *
+static void _mcd_client_proxy_take_approver_filters
+    (McdClientProxy *self, GList *filters);
+static void _mcd_client_proxy_take_observer_filters
+    (McdClientProxy *self, GList *filters);
+static void _mcd_client_proxy_take_handler_filters
+    (McdClientProxy *self, GList *filters);
+
+static gchar *
 _mcd_client_proxy_find_client_file (const gchar *client_name)
 {
     const gchar * const *dirs;
@@ -954,29 +961,14 @@ _mcd_client_proxy_set_bypass_approval (McdClientProxy *self,
 }
 
 void
-_mcd_client_proxy_clear_capability_tokens (McdClientProxy *self)
-{
-    g_return_if_fail (MCD_IS_CLIENT_PROXY (self));
-
-    tp_handle_set_destroy (self->priv->capability_tokens);
-    self->priv->capability_tokens = tp_handle_set_new (
-        self->priv->string_pool);
-}
-
-TpHandleSet *
-_mcd_client_proxy_peek_capability_tokens (McdClientProxy *self)
-{
-    g_return_val_if_fail (MCD_IS_CLIENT_PROXY (self), NULL);
-    return self->priv->capability_tokens;
-}
-
-void
 _mcd_client_proxy_become_incapable (McdClientProxy *self)
 {
     _mcd_client_proxy_take_approver_filters (self, NULL);
     _mcd_client_proxy_take_observer_filters (self, NULL);
     _mcd_client_proxy_take_handler_filters (self, NULL);
-    _mcd_client_proxy_clear_capability_tokens (self);
+    tp_handle_set_destroy (self->priv->capability_tokens);
+    self->priv->capability_tokens = tp_handle_set_new (
+        self->priv->string_pool);
 }
 
 typedef struct {
-- 
1.5.6.5