[telepathy-mission-control/master] _mcd_client_proxy_set_bypass_approval, _mcd_client_proxy_add_cap_tokens: localize

[Simon McVittie]

---
 src/mcd-client-priv.h |    5 -----
 src/mcd-client.c      |   20 ++++++--------------
 2 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/src/mcd-client-priv.h b/src/mcd-client-priv.h
index 996454a..eb257b6 100644
--- a/src/mcd-client-priv.h
+++ b/src/mcd-client-priv.h
@@ -104,11 +104,6 @@ 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_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 GValueArray *_mcd_client_proxy_dup_handler_capabilities (
     McdClientProxy *self);
diff --git a/src/mcd-client.c b/src/mcd-client.c
index 6d8b59c..ee379fd 100644
--- a/src/mcd-client.c
+++ b/src/mcd-client.c
@@ -271,6 +271,9 @@ parse_client_filter (GKeyFile *file, const gchar *group)
     return filter;
 }
 
+static void _mcd_client_proxy_add_cap_tokens (McdClientProxy *self,
+                                              const gchar * const *cap_tokens);
+
 static void
 parse_client_file (McdClientProxy *client,
                    GKeyFile *file)
@@ -341,7 +344,7 @@ parse_client_file (McdClientProxy *client,
     /* Other client options */
     bypass = g_key_file_get_boolean (file, TP_IFACE_CLIENT_HANDLER,
                                      "BypassApproval", NULL);
-    _mcd_client_proxy_set_bypass_approval (client, bypass);
+    client->priv->bypass_approval = bypass;
 
     cap_tokens = g_key_file_get_keys (file,
                                       TP_IFACE_CLIENT_HANDLER ".Capabilities",
@@ -446,14 +449,12 @@ _mcd_client_proxy_set_filters (McdClientProxy *client,
 
 /* This is NULL-safe for the last argument, for ease of use with
  * tp_asv_get_boxed */
-void
+static void
 _mcd_client_proxy_add_cap_tokens (McdClientProxy *self,
                                   const gchar * const *cap_tokens)
 {
     guint i;
 
-    g_return_if_fail (MCD_IS_CLIENT_PROXY (self));
-
     if (cap_tokens == NULL)
         return;
 
@@ -577,7 +578,7 @@ _mcd_client_proxy_set_handler_properties (McdClientProxy *self,
 
     /* if wrong type or absent, assuming False is reasonable */
     bypass = tp_asv_get_boolean (properties, "BypassApproval", NULL);
-    _mcd_client_proxy_set_bypass_approval (self, bypass);
+    self->priv->bypass_approval = bypass;
     DEBUG ("%s has BypassApproval=%c", bus_name, bypass ? 'T' : 'F');
 
     _mcd_client_proxy_add_cap_tokens (self,
@@ -1024,15 +1025,6 @@ _mcd_client_proxy_get_bypass_approval (McdClientProxy *self)
 }
 
 void
-_mcd_client_proxy_set_bypass_approval (McdClientProxy *self,
-                                       gboolean bypass)
-{
-    g_return_if_fail (MCD_IS_CLIENT_PROXY (self));
-
-    self->priv->bypass_approval = bypass;
-}
-
-void
 _mcd_client_proxy_become_incapable (McdClientProxy *self)
 {
     _mcd_client_proxy_take_approver_filters (self, NULL);
-- 
1.5.6.5