summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmmanuele Bassi <ebassi@gnome.org>2013-06-12 09:51:10 +0100
committerEmmanuele Bassi <ebassi@gnome.org>2013-06-12 10:09:34 +0100
commit5885ffb2d91faabd65bdb81c6570261d18ccc220 (patch)
treec43f0fb313c2171369be1c8cb3189c209eed91e7
parente310c68d7b38d521e341f4e8a36f54303079d74e (diff)
downloadclutter-5885ffb2d91faabd65bdb81c6570261d18ccc220.tar.gz
actor: Fix has_constraints() and has_actions()
When we changed the MetaGroup to handle internal effects, we updated has_effects(), but forgot to fix the equivalent has_constrains() and has_actions() method. Now, if we clear the constraints or the actions on an actor, and we call has_constraints() or has_actions(), we get an false positive.
-rw-r--r--clutter/clutter-actor.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/clutter/clutter-actor.c b/clutter/clutter-actor.c
index 0fc8df64e..8db166b66 100644
--- a/clutter/clutter-actor.c
+++ b/clutter/clutter-actor.c
@@ -17273,7 +17273,10 @@ clutter_actor_has_constraints (ClutterActor *self)
{
g_return_val_if_fail (CLUTTER_IS_ACTOR (self), FALSE);
- return self->priv->constraints != NULL;
+ if (self->priv->constraints == NULL)
+ return FALSE;
+
+ return _clutter_meta_group_has_metas_no_internal (self->priv->constraints);
}
/**
@@ -17292,7 +17295,10 @@ clutter_actor_has_actions (ClutterActor *self)
{
g_return_val_if_fail (CLUTTER_IS_ACTOR (self), FALSE);
- return self->priv->actions != NULL;
+ if (self->priv->actions == NULL)
+ return FALSE;
+
+ return _clutter_meta_group_has_metas_no_internal (self->priv->actions);
}
/**