From cc21a4aa5f66e3fb1253587def2d7368cfd1db07 Mon Sep 17 00:00:00 2001 From: Chris Lord Date: Thu, 26 Mar 2009 20:28:04 +0000 Subject: [PATCH] [ClutterTimeline] Fix clutter_timeline_set_delay When setting a delay, timeout_add was being used with msecs. timeout_add takes fps since the fix to bug #1495. Delay now uses g_timeout_add instead. --- clutter/clutter-timeline.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/clutter/clutter-timeline.c b/clutter/clutter-timeline.c index bf904ff3c..72abc0b48 100644 --- a/clutter/clutter-timeline.c +++ b/clutter/clutter-timeline.c @@ -347,7 +347,7 @@ clutter_timeline_dispose (GObject *object) if (priv->delay_id) { - timeout_remove (priv->delay_id); + g_source_remove (priv->delay_id); priv->delay_id = 0; } @@ -875,9 +875,9 @@ clutter_timeline_start (ClutterTimeline *timeline) if (priv->delay) { - priv->delay_id = timeout_add (priv->delay, - delay_timeout_func, - timeline, NULL); + priv->delay_id = g_timeout_add (priv->delay, + (GSourceFunc)delay_timeout_func, + timeline); } else { @@ -907,7 +907,7 @@ clutter_timeline_pause (ClutterTimeline *timeline) if (priv->delay_id) { - timeout_remove (priv->delay_id); + g_source_remove (priv->delay_id); priv->delay_id = 0; }