[telepathy-mission-control/master] McdClientProxy: internalize all temporary API, except the iterator

[Simon McVittie]

Having the fact that we iterate by using a GHashTableIter leak through
the abstraction isn't *that* bad, and it saves writing yet another
iterator API! I might revisit this when McdDispatcher is more like the
shape I intend it to be.
---
 src/client-registry.c |   12 +++---------
 src/client-registry.h |   10 ----------
 2 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/src/client-registry.c b/src/client-registry.c
index 1192a3b..09997ef 100644
--- a/src/client-registry.c
+++ b/src/client-registry.c
@@ -68,11 +68,9 @@ struct _McdClientRegistryPrivate
   gboolean startup_completed;
 };
 
-void
+static void
 _mcd_client_registry_inc_startup_lock (McdClientRegistry *self)
 {
-  g_return_if_fail (MCD_IS_CLIENT_REGISTRY (self));
-
   if (!self->priv->startup_completed)
     {
       DEBUG ("%" G_GSIZE_FORMAT " -> %" G_GSIZE_FORMAT,
@@ -82,11 +80,9 @@ _mcd_client_registry_inc_startup_lock (McdClientRegistry *self)
     }
 }
 
-void
+static void
 _mcd_client_registry_dec_startup_lock (McdClientRegistry *self)
 {
-  g_return_if_fail (MCD_IS_CLIENT_REGISTRY (self));
-
   if (self->priv->startup_completed)
     return;
 
@@ -109,7 +105,7 @@ static void mcd_client_registry_ready_cb (McdClientProxy *client,
 static void mcd_client_registry_gone_cb (McdClientProxy *client,
     McdClientRegistry *self);
 
-void
+static void
 _mcd_client_registry_found_name (McdClientRegistry *self,
     const gchar *well_known_name,
     const gchar *unique_name_if_known,
@@ -117,8 +113,6 @@ _mcd_client_registry_found_name (McdClientRegistry *self,
 {
   McdClientProxy *client;
 
-  g_return_if_fail (MCD_IS_CLIENT_REGISTRY (self));
-
   if (!g_str_has_prefix (well_known_name, TP_CLIENT_BUS_NAME_BASE))
     {
       /* This is not a Telepathy Client */
diff --git a/src/client-registry.h b/src/client-registry.h
index 6701f37..58bfe8c 100644
--- a/src/client-registry.h
+++ b/src/client-registry.h
@@ -75,19 +75,9 @@ G_GNUC_INTERNAL GPtrArray *_mcd_client_registry_dup_client_caps (
 G_GNUC_INTERNAL gboolean _mcd_client_registry_is_ready (
     McdClientRegistry *self);
 
-/* Temporary API for porting */
-
-G_GNUC_INTERNAL void _mcd_client_registry_found_name (
-    McdClientRegistry *self, const gchar *well_known_name,
-    const gchar *unique_name_if_known, gboolean activatable);
 G_GNUC_INTERNAL void _mcd_client_registry_init_hash_iter (
     McdClientRegistry *self, GHashTableIter *iter);
 
-G_GNUC_INTERNAL void _mcd_client_registry_inc_startup_lock (
-    McdClientRegistry *self);
-G_GNUC_INTERNAL void _mcd_client_registry_dec_startup_lock (
-    McdClientRegistry *self);
-
 G_END_DECLS
 
 #endif
-- 
1.5.6.5