brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

actor: Add IN_DESTRUCTION checks

Browse Source 
Commit 80626e7584 removed an
IN_DESTRUCTION check from within the add_child_internal() method,
outlining an option for bringing it back. It was too late for the 1.10
cycle to do it, and eventually pick up the pieces, but now that we're
at the beginning of the 1.11 cycle we can restore it, and add checks
elsewhere to balance it.
This commit is contained in:
Emmanuele Bassi 2012-03-26 18:31:42 +01:00
parent 67058229f0
commit 1ef85372cc
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
clutter/clutter-actor.c
View File

@ -11761,6 +11761,11 @@ clutter_actor_set_child_above_sibling (ClutterActor *self,
if (sibling != NULL)
g_return_if_fail (sibling->priv->parent == self);
if (CLUTTER_ACTOR_IN_DESTRUCTION (self) ||
CLUTTER_ACTOR_IN_DESTRUCTION (child) ||
(sibling != NULL && CLUTTER_ACTOR_IN_DESTRUCTION (sibling)))
return;
/* we don't want to change the state of child, or emit signals, or
* regenerate ChildMeta instances here, but we still want to follow
* the correct sequence of steps encoded in remove_child() and
@ -11807,6 +11812,11 @@ clutter_actor_set_child_below_sibling (ClutterActor *self,
if (sibling != NULL)
g_return_if_fail (sibling->priv->parent == self);
if (CLUTTER_ACTOR_IN_DESTRUCTION (self) ||
CLUTTER_ACTOR_IN_DESTRUCTION (child) ||
(sibling != NULL && CLUTTER_ACTOR_IN_DESTRUCTION (sibling)))
return;
/* see the comment in set_child_above_sibling() */
g_object_ref (child);
clutter_actor_remove_child_internal (self, child, 0);
@ -11842,6 +11852,10 @@ clutter_actor_set_child_at_index (ClutterActor *self,
g_return_if_fail (child->priv->parent == self);
g_return_if_fail (index_ <= self->priv->n_children);
if (CLUTTER_ACTOR_IN_DESTRUCTION (self) ||
CLUTTER_ACTOR_IN_DESTRUCTION (child))
return;
g_object_ref (child);
clutter_actor_remove_child_internal (self, child, 0);
clutter_actor_add_child_internal (self, child,