2007-11-06 Emmanuele Bassi <ebassi@openedhand.com>

	* clutter/clutter-box.c (clutter_box_dispose): Call unparent()
	on the children, instead of destroy(), to avoid a double free
	and a crash when destroying a ClutterBox.

diff --git a/ChangeLog b/ChangeLog
index 8b7f714..7bfa91e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2007-11-06  Emmanuele Bassi  <ebassi@openedhand.com>
 
+       * clutter/clutter-box.c (clutter_box_dispose): Call unparent()
+       on the children, instead of destroy(), to avoid a double free
+       and a crash when destroying a ClutterBox.
+
+2007-11-06  Emmanuele Bassi  <ebassi@openedhand.com>
+
        * clutter/clutter-label.c: Break the references in ::dispose,
        and free the resources in ::finalize.
 

diff --git a/clutter/clutter-box.c b/clutter/clutter-box.c
index fd8778e..3a68930 100644 (file)
--- a/clutter/clutter-box.c
+++ b/clutter/clutter-box.c
@@ -349,7 +349,7 @@ clutter_box_dispose (GObject *gobject)
     {
       ClutterBoxChild *child = l->data;
 
-      clutter_actor_destroy (child->actor);
+      clutter_actor_unparent (child->actor);
       g_slice_free (ClutterBoxChild, child);
     }