isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-26 18:11:05 -05:00
Code Issues Packages Projects Releases Wiki Activity

actor: Call unparent() in destroy

Browse Source 
If the actor is an internal child of another actor then we should call
unparent() when destroying it, like clutter_actor_reparent() does;
otherwise we'll leak the actor, since the parent holds a reference to
it.

http://bugzilla.openedhand.com/show_bug.cgi?id=2009
This commit is contained in:
Emmanuele Bassi 2010-02-28 10:59:29 +00:00
parent 9f67e4826c
commit ce6a24eb2b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
clutter/clutter-actor.c
View File

@ -3067,7 +3067,7 @@ clutter_actor_dispose (GObject *object)
clutter_container_remove_actor (CLUTTER_CONTAINER (parent), self); clutter_container_remove_actor (CLUTTER_CONTAINER (parent), self);
} }
else else
priv->parent_actor = NULL; clutter_actor_unparent (self);
} }
/* parent should be gone */ /* parent should be gone */
@ -7010,7 +7010,7 @@ clutter_actor_reparent (ClutterActor *self,
else else
clutter_actor_unparent (self); clutter_actor_unparent (self);
/* Note, will call parent() */ /* Note, will call parent() */
if (CLUTTER_IS_CONTAINER (new_parent)) if (CLUTTER_IS_CONTAINER (new_parent))
clutter_container_add_actor (CLUTTER_CONTAINER (new_parent), self); clutter_container_add_actor (CLUTTER_CONTAINER (new_parent), self);
else else