[clutter/deprecate-default-stage: 7/12] Merge with interactive/*

[Emmanuele Bassi <ebassi src gnome org>]

commit 5813fdd944e356a33a3db321cfc845f9ce735fa5
Author: Emmanuele Bassi <ebassi linux intel com>
Date:   Wed Nov 9 14:01:40 2011 +0000

    Merge with interactive/*

 tests/conform/test-score.c    |    4 +++-
 tests/conform/test-timeline.c |    5 +++--
 2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/tests/conform/test-score.c b/tests/conform/test-score.c
index 2554cfd..a827f7e 100644
--- a/tests/conform/test-score.c
+++ b/tests/conform/test-score.c
@@ -55,7 +55,7 @@ test_score (TestConformSimpleFixture *fixture,
   GSList *timelines;
 
   /* FIXME - this is necessary to make the master clock spin */
-  (void) clutter_stage_get_default ();
+  ClutterActor *stage = clutter_stage_new ();
 
   timeline_1 = clutter_timeline_new (100);
   g_object_set_data_full (G_OBJECT (timeline_1),
@@ -110,6 +110,8 @@ test_score (TestConformSimpleFixture *fixture,
 
   clutter_score_start (score);
 
+  clutter_actor_destroy (stage);
+
   g_object_unref (timeline_1);
   g_object_unref (timeline_2);
   g_object_unref (timeline_3);
diff --git a/tests/conform/test-timeline.c b/tests/conform/test-timeline.c
index a04e948..7a1c179 100644
--- a/tests/conform/test-timeline.c
+++ b/tests/conform/test-timeline.c
@@ -185,7 +185,6 @@ void
 test_timeline (TestConformSimpleFixture *fixture,
 	       gconstpointer data)
 {
-  ClutterActor *stage G_GNUC_UNUSED;
   ClutterTimeline *timeline_1;
   TimelineData data_1;
   ClutterTimeline *timeline_2;
@@ -198,7 +197,7 @@ test_timeline (TestConformSimpleFixture *fixture,
 
   /* NB: We have to ensure a stage is instantiated else the master
    * clock wont run... */
-  stage = clutter_stage_get_default ();
+  ClutterActor *stage = clutter_stage_new ();
 
   timeline_data_init (&data_1, 1);
   timeline_1 = clutter_timeline_new (FRAME_COUNT * 1000 / FPS);
@@ -316,4 +315,6 @@ test_timeline (TestConformSimpleFixture *fixture,
   timeline_data_destroy (&data_3);
 
   g_source_remove (delay_tag);
+
+  clutter_actor_destroy (stage);
 }