2006-06-01 Matthew Allum <mallum@openedhand.com>

* clutter/clutter-element.c:
        Fix a snafu in clutter_element_raise ()

        * clutter/clutter-timeline.c:
        * clutter/clutter-timeline.h:
        Add new clutter_timeline_is_playing() method

ChangeLog

@@ -1,3 +1,12 @@
+2006-06-01  Matthew Allum  <mallum@openedhand.com>
+
+	* clutter/clutter-element.c:
+	Fix a snafu in clutter_element_raise ()
+
+	* clutter/clutter-timeline.c:
+	* clutter/clutter-timeline.h:
+	Add new clutter_timeline_is_playing() method
+
 2006-05-29  Matthew Allum  <mallum@openedhand.com>
 
 	* clutter/clutter-color.c: (clutter_color_set):

clutter/clutter-element.c

@@ -1170,13 +1170,12 @@ clutter_element_get_parent (ClutterElement *self)
 void
 clutter_element_raise (ClutterElement *self, ClutterElement *below)
 {
+  g_return_if_fail (CLUTTER_IS_ELEMENT(self));
   g_return_if_fail (clutter_element_get_parent (self) != NULL);
-  g_return_if_fail 
-    (clutter_element_get_parent (self) != clutter_element_get_parent (below));
 
   clutter_group_raise (CLUTTER_GROUP(clutter_element_get_parent (self)),
-		     self,
-		     below);
+		       self,
+		       below);
 }
 
 /**

clutter/clutter-timeline.c

@@ -462,6 +462,21 @@ clutter_timeline_set_speed (ClutterTimeline *timeline, guint fps)
     }
 }
 
+/**
+ * clutter_timeline_is_playing:
+ * @timeline: A #ClutterTimeline
+ *
+ * Query state of a #ClutterTimeline instance.
+ *
+ * Return Value: TRUE if timeline is currently playing, FALSE if not.
+ */
+gboolean
+clutter_timeline_is_playing (ClutterTimeline *timeline)
+{
+  return (timeline->priv->timeout_id != 0);
+}
+
+
 /**
  * clutter_timeline_new:
  * @nframes: #ClutterTimeline number of frames

clutter/clutter-timeline.h

@@ -107,6 +107,9 @@ clutter_timeline_get_current_frame (ClutterTimeline *timeline);
 guint
 clutter_timeline_get_n_frames (ClutterTimeline *timeline);
 
+gboolean
+clutter_timeline_is_playing (ClutterTimeline *timeline);
+
 G_END_DECLS
 
 #endif