diff --git a/ChangeLog b/ChangeLog
index f0624b392..789d55a2b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2008-02-01  Emmanuele Bassi  <ebassi@openedhand.com>
+
+	* clutter/clutter-actor.c:
+	(clutter_actor_get_property): Use clutter_actor_get_reactive()
+	instead of the IS_REACTIVE() macro.
+
+	(clutter_actor_set_reactive): Emit the notify signal for the
+	reactive property.
+
+	* clutter/clutter-timeline.c:
+	(timeline_timeout_func),
+	(clutter_timeline_get_delta): Coding style fixes.
+
 2008-01-31  Rob Bradford  <rob@openedhand.com>
 
 	* clutter/glx/clutter-stage-glx.c:
diff --git a/clutter/clutter-actor.c b/clutter/clutter-actor.c
index f29fba8c7..f3cbe98ee 100644
--- a/clutter/clutter-actor.c
+++ b/clutter/clutter-actor.c
@@ -1277,8 +1277,7 @@ clutter_actor_get_property (GObject    *object,
       g_value_set_double (value, CLUTTER_FIXED_TO_DOUBLE (priv->scale_y));
       break;
     case PROP_REACTIVE:
-      g_value_set_boolean (value,
-                           (CLUTTER_ACTOR_IS_REACTIVE (actor) != FALSE));
+      g_value_set_boolean (value, clutter_actor_get_reactive (actor));
       break;
     case PROP_ROTATION_ANGLE_X:
       g_value_set_double (value, CLUTTER_FIXED_TO_DOUBLE (priv->rxang));
@@ -3998,6 +3997,8 @@ clutter_actor_set_reactive (ClutterActor *actor,
     CLUTTER_ACTOR_SET_FLAGS (actor, CLUTTER_ACTOR_REACTIVE);
   else
     CLUTTER_ACTOR_UNSET_FLAGS (actor, CLUTTER_ACTOR_REACTIVE);
+
+  g_object_notify (G_OBJECT (actor), "reactive");
 }
 
 /**
diff --git a/clutter/clutter-timeline.c b/clutter/clutter-timeline.c
index 218c0d1fc..6f942d415 100644
--- a/clutter/clutter-timeline.c
+++ b/clutter/clutter-timeline.c
@@ -531,7 +531,7 @@ timeline_timeout_func (gpointer data)
       /* First frame, set up timings.*/
       priv->start_frame_secs = timeval.tv_sec;
       priv->skipped_frames   = 0;
-	  priv->msecs_delta = 0;
+      priv->msecs_delta      = 0;
 
       msecs     = timeval.tv_usec / 1000;
       n_frames  = 1;
@@ -571,10 +571,8 @@ timeline_timeout_func (gpointer data)
        * to emit the last new-frame signal with the last frame
        */
       if (n_frames > 1)
-	{
-	  g_signal_emit (timeline, timeline_signals[NEW_FRAME], 0,
-                         priv->current_frame_num);
-	}
+	g_signal_emit (timeline, timeline_signals[NEW_FRAME], 0,
+                       priv->current_frame_num);
 
       if (priv->loop)
 	{
@@ -1250,9 +1248,7 @@ clutter_timeline_get_delta (ClutterTimeline *timeline,
   priv = timeline->priv;
 
   if (msecs)
-    {
-      *msecs = timeline->priv->msecs_delta;
-    }
+    *msecs = timeline->priv->msecs_delta;
 
   return priv->skipped_frames + 1;
 }