From d7dc1d7c97fd168182c158d97607d114341d1ae2 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Wed, 15 Aug 2007 19:50:31 +0000 Subject: [PATCH] Add checks on the reactive accessors Check for the parameter in the various "reactive" flag accessors. --- clutter/clutter-actor.c | 16 +++++++++++----- clutter/clutter-main.c | 2 +- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/clutter/clutter-actor.c b/clutter/clutter-actor.c index bf39510..039fff4 100644 --- a/clutter/clutter-actor.c +++ b/clutter/clutter-actor.c @@ -510,10 +510,10 @@ clutter_actor_transform_vertices (ClutterActor * self, * the actor; the returned vertices relate to the ClutterActoBox * coordinances as follows: * - * v[0] contains (x1, y1) - * v[1] contains (x2, y1) - * v[2] contains (x1, y2) - * v[3] contains (x2, y2) + * v[0] contains (x1, y1) + * v[1] contains (x2, y1) + * v[2] contains (x1, y2) + * v[3] contains (x2, y2) * * Since: 0.4 **/ @@ -2820,7 +2820,7 @@ clutter_actor_lower_bottom (ClutterActor *self) * * Return value: the return value from the signal emission * - * Since: 0.4 + * Since: 0.6 */ gboolean clutter_actor_event (ClutterActor *actor, @@ -2888,18 +2888,24 @@ clutter_actor_event (ClutterActor *actor, void clutter_actor_set_reactive (ClutterActor *actor) { + g_return_if_fail (CLUTTER_IS_ACTOR (actor)); + CLUTTER_ACTOR_SET_FLAGS (actor, CLUTTER_ACTOR_REACTIVE); } void clutter_actor_unset_reactive (ClutterActor *actor) { + g_return_if_fail (CLUTTER_IS_ACTOR (actor)); + CLUTTER_ACTOR_UNSET_FLAGS (actor, CLUTTER_ACTOR_REACTIVE); } gboolean clutter_actor_is_reactive (ClutterActor *actor) { + g_return_val_if_fail (CLUTTER_IS_ACTOR (actor), FALSE); + return CLUTTER_ACTOR_IS_REACTIVE(actor); } diff --git a/clutter/clutter-main.c b/clutter/clutter-main.c index 752137f..fadedb2 100644 --- a/clutter/clutter-main.c +++ b/clutter/clutter-main.c @@ -244,7 +244,7 @@ clutter_do_event (ClutterEvent *event) do { clutter_actor_event (actor, event); - actor = clutter_actor_get_parent(actor); + actor = clutter_actor_get_parent (actor); } while (actor != NULL); } -- 2.7.4