[telepathy-mission-control/master] _mcd_client_proxy_become_incapable: move mcd_client_become_incapable here

[Simon McVittie]

---
 src/mcd-client-priv.h |    1 +
 src/mcd-client.c      |    9 +++++++++
 src/mcd-dispatcher.c  |   13 ++-----------
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/mcd-client-priv.h b/src/mcd-client-priv.h
index 687f5a4..768d915 100644
--- a/src/mcd-client-priv.h
+++ b/src/mcd-client-priv.h
@@ -100,6 +100,7 @@ G_GNUC_INTERNAL const GList *_mcd_client_proxy_get_handler_filters
 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
diff --git a/src/mcd-client.c b/src/mcd-client.c
index 8c03075..c5ba105 100644
--- a/src/mcd-client.c
+++ b/src/mcd-client.c
@@ -583,3 +583,12 @@ _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);
+}
diff --git a/src/mcd-dispatcher.c b/src/mcd-dispatcher.c
index ebb33bd..6a0c505 100644
--- a/src/mcd-dispatcher.c
+++ b/src/mcd-dispatcher.c
@@ -305,18 +305,9 @@ mcd_dispatcher_context_handler_done (McdDispatcherContext *context)
 }
 
 static void
-mcd_client_become_incapable (McdClient *client)
-{
-    _mcd_client_proxy_take_approver_filters (client->proxy, NULL);
-    _mcd_client_proxy_take_observer_filters (client->proxy, NULL);
-    _mcd_client_proxy_take_handler_filters (client->proxy, NULL);
-    _mcd_client_proxy_clear_capability_tokens (client->proxy);
-}
-
-static void
 mcd_client_free (McdClient *client)
 {
-    mcd_client_become_incapable (client);
+    _mcd_client_proxy_become_incapable (client->proxy);
 
     if (client->proxy)
     {
@@ -2816,7 +2807,7 @@ name_owner_changed_cb (TpDBusDaemon *proxy,
                 /* in ContactCapabilities we indicate the disappearance
                  * of a client by giving it an empty set of capabilities and
                  * filters */
-                mcd_client_become_incapable (client);
+                _mcd_client_proxy_become_incapable (client->proxy);
                 mcd_dispatcher_update_client_caps (self, client);
                 g_hash_table_remove (priv->clients, name);
             }
-- 
1.5.6.5