From 3addeb91ccfe38676a52582aac594cf98269faf3 Mon Sep 17 00:00:00 2001
From: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Fri, 18 Feb 2011 15:53:27 +0000
Subject: [PATCH] Privatize all ClutterIdPool functions

The clutter-id-pool.h header is private and not installed; yet, all the
clutter_id_pool_* symbols are public. Let's correct this oversight we've
been stringing along since forever.
---
 clutter/clutter-id-pool.c | 16 ++++++++--------
 clutter/clutter-id-pool.h | 16 ++++++++--------
 clutter/clutter-main.c    |  8 ++++----
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/clutter/clutter-id-pool.c b/clutter/clutter-id-pool.c
index d30e42016..9978cb03a 100644
--- a/clutter/clutter-id-pool.c
+++ b/clutter/clutter-id-pool.c
@@ -42,7 +42,7 @@ struct _ClutterIDPool
 };
 
 ClutterIDPool *
-clutter_id_pool_new  (guint initial_size)
+_clutter_id_pool_new  (guint initial_size)
 {
   ClutterIDPool *self;
 
@@ -55,7 +55,7 @@ clutter_id_pool_new  (guint initial_size)
 }
 
 void
-clutter_id_pool_free (ClutterIDPool *id_pool)
+_clutter_id_pool_free (ClutterIDPool *id_pool)
 {
   g_return_if_fail (id_pool != NULL);
 
@@ -65,8 +65,8 @@ clutter_id_pool_free (ClutterIDPool *id_pool)
 }
 
 guint32
-clutter_id_pool_add (ClutterIDPool *id_pool,
-                     gpointer       ptr)
+_clutter_id_pool_add (ClutterIDPool *id_pool,
+                      gpointer       ptr)
 {
   gpointer *array;
   guint32 retval;
@@ -92,8 +92,8 @@ clutter_id_pool_add (ClutterIDPool *id_pool,
 }
 
 void
-clutter_id_pool_remove (ClutterIDPool *id_pool,
-                        guint32        id_)
+_clutter_id_pool_remove (ClutterIDPool *id_pool,
+                         guint32        id_)
 {
   gpointer *array;
 
@@ -109,8 +109,8 @@ clutter_id_pool_remove (ClutterIDPool *id_pool,
 }
 
 gpointer
-clutter_id_pool_lookup (ClutterIDPool *id_pool,
-                        guint32        id_)
+_clutter_id_pool_lookup (ClutterIDPool *id_pool,
+                         guint32        id_)
 {
   gpointer *array;
 
diff --git a/clutter/clutter-id-pool.h b/clutter/clutter-id-pool.h
index 07bf08806..2c41363ae 100644
--- a/clutter/clutter-id-pool.h
+++ b/clutter/clutter-id-pool.h
@@ -34,15 +34,15 @@ G_BEGIN_DECLS
 
 typedef struct _ClutterIDPool   ClutterIDPool;
 
-ClutterIDPool *clutter_id_pool_new     (guint          initial_size);
-void           clutter_id_pool_free    (ClutterIDPool *id_pool);
+ClutterIDPool * _clutter_id_pool_new    (guint          initial_size);
+void            _clutter_id_pool_free   (ClutterIDPool *id_pool);
 
-guint32        clutter_id_pool_add     (ClutterIDPool *id_pool,
-                                        gpointer       ptr);
-void           clutter_id_pool_remove  (ClutterIDPool *id_pool,
-                                        guint32        id_);
-gpointer       clutter_id_pool_lookup  (ClutterIDPool *id_pool,
-                                        guint32        id_);
+guint32         _clutter_id_pool_add    (ClutterIDPool *id_pool,
+                                         gpointer       ptr);
+void            _clutter_id_pool_remove (ClutterIDPool *id_pool,
+                                         guint32        id_);
+gpointer        _clutter_id_pool_lookup (ClutterIDPool *id_pool,
+                                         guint32        id_);
 
 
 G_END_DECLS
diff --git a/clutter/clutter-main.c b/clutter/clutter-main.c
index 5748aa9ed..f0290bb12 100644
--- a/clutter/clutter-main.c
+++ b/clutter/clutter-main.c
@@ -293,7 +293,7 @@ _clutter_actor_get_by_id (guint32 actor_id)
 
   g_assert (context->id_pool != NULL);
 
-  return clutter_id_pool_lookup (context->id_pool, actor_id);
+  return _clutter_id_pool_lookup (context->id_pool, actor_id);
 }
 
 void
@@ -1571,7 +1571,7 @@ pre_parse_hook (GOptionContext  *context,
 
   clutter_context = _clutter_context_get_default ();
 
-  clutter_context->id_pool = clutter_id_pool_new (256);
+  clutter_context->id_pool = _clutter_id_pool_new (256);
 
   backend = clutter_context->backend;
   g_assert (CLUTTER_IS_BACKEND (backend));
@@ -3249,7 +3249,7 @@ _clutter_context_acquire_id (gpointer key)
 {
   ClutterMainContext *context = _clutter_context_get_default ();
 
-  return clutter_id_pool_add (context->id_pool, key);
+  return _clutter_id_pool_add (context->id_pool, key);
 }
 
 void
@@ -3257,7 +3257,7 @@ _clutter_context_release_id (guint32 id_)
 {
   ClutterMainContext *context = _clutter_context_get_default ();
 
-  return clutter_id_pool_remove (context->id_pool, id_);
+  return _clutter_id_pool_remove (context->id_pool, id_);
 }
 
 void