From c8499a761976b3ce6dd8d6d0c44d61c06ceccdf8 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Thu, 7 Feb 2008 11:53:52 +0000 Subject: [PATCH] 2008-02-07 Emmanuele Bassi * clutter/clutter-score.c (traverse_children): Actually implement clutter_score_list_timelines(). * tests/test-score.c (main): Test clutter_score_list_timelines(). --- ChangeLog | 29 ++++++++++++++++++----------- clutter/clutter-score.c | 3 ++- tests/test-score.c | 5 +++++ 3 files changed, 25 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index 25a2a6eed..976ecae40 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,39 +1,46 @@ +2008-02-07 Emmanuele Bassi + + * clutter/clutter-score.c (traverse_children): Actually implement + clutter_score_list_timelines(). + + * tests/test-score.c (main): Test clutter_score_list_timelines(). + 2008-02-07 Matthew Allum * clutter/pango/pangoclutter-render.c: - Warn if requested glyph is too big for underlying texture cache. - (see #666) + Warn if requested glyph is too big for underlying texture cache. + (see #666) 2008-02-07 Matthew Allum * clutter/clutter-texture.c: (texture_upload_data): - Remove random appearing 'priv->filter_quality =1' (#643) + Remove random appearing 'priv->filter_quality =1' (#643) 2008-02-06 Matthew Allum * clutter/clutter-texture.c: - Minor clean up from last commit. + Minor clean up from last commit. * tests/test-fbo.c: - Swall tweak (rotate offscreen, rather than resize) + Small tweak (rotate offscreen, rather than resize) 2008-02-06 Matthew Allum * clutter/clutter-texture.c: - Initial attempt at handling resizing/tranformed source textures. + Initial attempt at handling resizing/tranformed source textures. * clutter/pango/pangoclutter-render.c: (draw_glyph): - Guards against freetype returning NULL bitmaps and - thus causing device by zeros on NVIDIA drivers. (see ml) + Guards against freetype returning NULL bitmaps and + thus causing device by zeros on NVIDIA drivers. (see ml) 2008-02-05 Matthew Allum * clutter/clutter-actor.c: (clutter_actor_get_vertices): - Make sure GL related Matrices are initialised. Fixes #756 + Make sure GL related Matrices are initialised. Fixes #756 * clutter/clutter-texture.c: - Fix up code from Norways answer to Jean-Michel Basquiat. - (warning on tile_get_pixbuf) + Fix up code from Norways answer to Jean-Michel Basquiat. + (warning on tile_get_pixbuf) 2008-02-05 Øyvind Kolås diff --git a/clutter/clutter-score.c b/clutter/clutter-score.c index 2051cd70f..ccbc966c7 100644 --- a/clutter/clutter-score.c +++ b/clutter/clutter-score.c @@ -729,7 +729,8 @@ traverse_children (GNode *node, break; case LIST_TIMELINES: - retval = TRUE; + closure->result = g_slist_prepend (closure->result, entry->timeline); + retval = FALSE; break; } diff --git a/tests/test-score.c b/tests/test-score.c index a16293dcc..9b6439b87 100644 --- a/tests/test-score.c +++ b/tests/test-score.c @@ -42,6 +42,7 @@ main (int argc, char **argv) ClutterTimeline *timeline_2; ClutterTimeline *timeline_3; ClutterTimeline *timeline_4; + GSList *timelines; guint t1, t2, t3, t4; clutter_init (&argc, &argv); @@ -83,6 +84,10 @@ main (int argc, char **argv) t3 = clutter_score_append (score, timeline_1, timeline_3); t4 = clutter_score_append (score, timeline_3, timeline_4); + timelines = clutter_score_list_timelines (score); + g_assert (4 == g_slist_length (timelines)); + g_slist_free (timelines); + clutter_score_start (score); clutter_main ();