[telepathy-mission-control/master] McdClientProxy: make the introspection pipeline callbacks internal

[Simon McVittie]

---
 src/mcd-client-priv.h |   14 --------------
 src/mcd-client.c      |   10 ++++++----
 2 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/src/mcd-client-priv.h b/src/mcd-client-priv.h
index 6d66efe..ebe7b41 100644
--- a/src/mcd-client-priv.h
+++ b/src/mcd-client-priv.h
@@ -88,12 +88,6 @@ G_GNUC_INTERNAL void _mcd_client_proxy_set_active (McdClientProxy *self,
                                                    const gchar *unique_name);
 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 gboolean _mcd_client_proxy_parse_client_file (
-    McdClientProxy *self);
-
 G_GNUC_INTERNAL const GList *_mcd_client_proxy_get_approver_filters
     (McdClientProxy *self);
 G_GNUC_INTERNAL const GList *_mcd_client_proxy_get_observer_filters
@@ -108,14 +102,6 @@ G_GNUC_INTERNAL void _mcd_client_proxy_become_incapable (McdClientProxy *self);
 G_GNUC_INTERNAL GValueArray *_mcd_client_proxy_dup_handler_capabilities (
     McdClientProxy *self);
 
-G_GNUC_INTERNAL void _mcd_client_proxy_get_interfaces_cb (TpProxy *proxy,
-    const GValue *out_Value, const GError *error,
-    gpointer user_data G_GNUC_UNUSED, GObject *weak_object G_GNUC_UNUSED);
-
-G_GNUC_INTERNAL void _mcd_client_proxy_handler_get_all_cb (
-    TpProxy *proxy, GHashTable *properties, const GError *error,
-    gpointer p, GObject *o);
-
 G_GNUC_INTERNAL void _mcd_client_proxy_inc_ready_lock (McdClientProxy *self);
 G_GNUC_INTERNAL void _mcd_client_proxy_dec_ready_lock (McdClientProxy *self);
 
diff --git a/src/mcd-client.c b/src/mcd-client.c
index 2a6b1cd..094967a 100644
--- a/src/mcd-client.c
+++ b/src/mcd-client.c
@@ -314,6 +314,8 @@ parse_client_filter (GKeyFile *file, const gchar *group)
 
 static void _mcd_client_proxy_add_cap_tokens (McdClientProxy *self,
                                               const gchar * const *cap_tokens);
+static void _mcd_client_proxy_add_interfaces (McdClientProxy *self,
+                                              const gchar * const *interfaces);
 
 static void
 parse_client_file (McdClientProxy *client,
@@ -509,7 +511,7 @@ _mcd_client_proxy_add_cap_tokens (McdClientProxy *self,
     }
 }
 
-void
+static void
 _mcd_client_proxy_add_interfaces (McdClientProxy *self,
                                   const gchar * const *interfaces)
 {
@@ -572,7 +574,7 @@ _mcd_client_proxy_get_unique_name (McdClientProxy *self)
     return self->priv->unique_name;
 }
 
-void
+static void
 _mcd_client_proxy_handler_get_all_cb (TpProxy *proxy,
                                       GHashTable *properties,
                                       const GError *error,
@@ -679,7 +681,7 @@ finally:
     _mcd_client_proxy_dec_ready_lock (self);
 }
 
-void
+static void
 _mcd_client_proxy_get_interfaces_cb (TpProxy *proxy,
                                      const GValue *out_Value,
                                      const GError *error,
@@ -747,7 +749,7 @@ finally:
     _mcd_client_proxy_dec_ready_lock (self);
 }
 
-gboolean
+static gboolean
 _mcd_client_proxy_parse_client_file (McdClientProxy *self)
 {
     gboolean file_found = FALSE;
-- 
1.5.6.5