* clutter/clutter-actor.c (clutter_actor_get_reactive)

	(clutter_actor_get_paint_visibility): Be sure to return exactly
	TRUE or FALSE instead of zero or some non-zero value in these
	functions that return a gboolean. Thanks to Kai Wei for spotting.

diff --git a/ChangeLog b/ChangeLog
index 437bc5e..972d33c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-11-13  Neil Roberts  <neil@linux.intel.com>
+
+       * clutter/clutter-actor.c (clutter_actor_get_reactive)
+       (clutter_actor_get_paint_visibility): Be sure to return exactly
+       TRUE or FALSE instead of zero or some non-zero value in these
+       functions that return a gboolean. Thanks to Kai Wei for spotting.
+
 2008-11-12  Emmanuele Bassi  <ebassi@linux.intel.com>
 
        * tests/conform/Makefile.am:

diff --git a/clutter/clutter-actor.c b/clutter/clutter-actor.c
index 346bf18..ef09d0a 100644 (file)
--- a/clutter/clutter-actor.c
+++ b/clutter/clutter-actor.c
@@ -5703,7 +5703,8 @@ clutter_actor_get_paint_visibility (ClutterActor *actor)
          && CLUTTER_ACTOR_IS_VISIBLE (actor))
     actor = clutter_actor_get_parent (actor);
 
-  return (CLUTTER_PRIVATE_FLAGS (actor) & CLUTTER_ACTOR_IS_TOPLEVEL);
+  return ((CLUTTER_PRIVATE_FLAGS (actor) & CLUTTER_ACTOR_IS_TOPLEVEL)
+          ? TRUE : FALSE);
 }
 
 /**
@@ -6085,7 +6086,7 @@ clutter_actor_get_reactive (ClutterActor *actor)
 {
   g_return_val_if_fail (CLUTTER_IS_ACTOR (actor), FALSE);
 
-  return CLUTTER_ACTOR_IS_REACTIVE (actor);
+  return CLUTTER_ACTOR_IS_REACTIVE (actor) ? TRUE : FALSE;
 }
 
 /**