From 999c0637848bc36b2a668f52ff58125a1f298dd8 Mon Sep 17 00:00:00 2001
From: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu, 21 Oct 2010 10:59:49 +0100
Subject: [PATCH] Clean up clutter-private.h/2

Move StageManager private API to a different header.
---
 clutter/Makefile.am                     |  1 +
 clutter/clutter-private.h               |  8 --------
 clutter/clutter-stage-manager-private.h | 18 ++++++++++++++++++
 clutter/clutter-stage-manager.c         | 13 ++-----------
 clutter/clutter-stage.c                 |  2 +-
 5 files changed, 22 insertions(+), 20 deletions(-)
 create mode 100644 clutter/clutter-stage-manager-private.h

diff --git a/clutter/Makefile.am b/clutter/Makefile.am
index be18dffdf..6cbcc57e3 100644
--- a/clutter/Makefile.am
+++ b/clutter/Makefile.am
@@ -230,6 +230,7 @@ source_h_priv = \
 	$(srcdir)/clutter-private.h 			\
 	$(srcdir)/clutter-profile.h			\
 	$(srcdir)/clutter-script-private.h		\
+	$(srcdir)/clutter-stage-manager-private.h	\
 	$(srcdir)/clutter-timeout-interval.h    	\
 	$(NULL)
 
diff --git a/clutter/clutter-private.h b/clutter/clutter-private.h
index 7183fedf6..5ed34668c 100644
--- a/clutter/clutter-private.h
+++ b/clutter/clutter-private.h
@@ -307,14 +307,6 @@ PangoContext *_clutter_context_get_pango_context    (ClutterMainContext *self);
 
 G_CONST_RETURN gchar *_clutter_gettext (const gchar *str);
 
-/* stage manager */
-void _clutter_stage_manager_add_stage         (ClutterStageManager *stage_manager,
-                                               ClutterStage        *stage);
-void _clutter_stage_manager_remove_stage      (ClutterStageManager *stage_manager,
-                                               ClutterStage        *stage);
-void _clutter_stage_manager_set_default_stage (ClutterStageManager *stage_manager,
-                                               ClutterStage        *stage);
-
 /* stage */
 void                _clutter_stage_do_paint             (ClutterStage *stage,
                                                          const ClutterGeometry *clip);
diff --git a/clutter/clutter-stage-manager-private.h b/clutter/clutter-stage-manager-private.h
new file mode 100644
index 000000000..8b74089ef
--- /dev/null
+++ b/clutter/clutter-stage-manager-private.h
@@ -0,0 +1,18 @@
+#ifndef __CLUTTER_STAGE_MANAGER_PRIVATE_H__
+#define __CLUTTER_STAGE_MANAGER_PRIVATE_H__
+
+#include <clutter/clutter-stage-manager.h>
+
+G_BEGIN_DECLS
+
+/* stage manager */
+void _clutter_stage_manager_add_stage         (ClutterStageManager *stage_manager,
+                                               ClutterStage        *stage);
+void _clutter_stage_manager_remove_stage      (ClutterStageManager *stage_manager,
+                                               ClutterStage        *stage);
+void _clutter_stage_manager_set_default_stage (ClutterStageManager *stage_manager,
+                                               ClutterStage        *stage);
+
+G_END_DECLS
+
+#endif /* __CLUTTER_STAGE_MANAGER_PRIVATE_H__ */
diff --git a/clutter/clutter-stage-manager.c b/clutter/clutter-stage-manager.c
index 7ffe4639e..e5c3133f1 100644
--- a/clutter/clutter-stage-manager.c
+++ b/clutter/clutter-stage-manager.c
@@ -40,12 +40,12 @@
 #include "config.h"
 #endif
 
+#include "clutter-stage-manager-private.h"
 
 #include "clutter-marshal.h"
 #include "clutter-debug.h"
 #include "clutter-private.h"
 #include "clutter-version.h"  
-#include "clutter-stage-manager.h"
 
 enum
 {
@@ -87,19 +87,10 @@ static void
 clutter_stage_manager_dispose (GObject *gobject)
 {
   ClutterStageManager *stage_manager;
-  GSList *l, *next;
 
   stage_manager = CLUTTER_STAGE_MANAGER (gobject);
 
-  for (l = stage_manager->stages; l; l = next)
-    {
-      ClutterActor *stage = l->data;
-      next = l->next;
-
-      if (stage)
-        clutter_actor_destroy (stage);
-    }
-
+  g_slist_foreach (stage_manager->stages, (GFunc) clutter_actor_destroy, NULL);
   g_slist_free (stage_manager->stages);
   stage_manager->stages = NULL;
 
diff --git a/clutter/clutter-stage.c b/clutter/clutter-stage.c
index 3d4c6e428..80ac80192 100644
--- a/clutter/clutter-stage.c
+++ b/clutter/clutter-stage.c
@@ -64,7 +64,7 @@
 #include "clutter-enum-types.h"
 #include "clutter-private.h"
 #include "clutter-debug.h"
-#include "clutter-stage-manager.h"
+#include "clutter-stage-manager-private.h"
 #include "clutter-stage-window.h"
 #include "clutter-version.h" 	/* For flavour */
 #include "clutter-id-pool.h"