Index: app/core/gimplist.c
===================================================================
RCS file: /cvs/gnome/gimp/app/core/gimplist.c,v
retrieving revision 1.33
diff -u -p -r1.33 gimplist.c
--- app/core/gimplist.c	16 Nov 2003 17:51:23 -0000	1.33
+++ app/core/gimplist.c	16 Mar 2004 12:50:47 -0000
@@ -34,8 +34,6 @@
 static void         gimp_list_class_init         (GimpListClass       *klass);
 static void         gimp_list_init               (GimpList            *list);
 
-static void         gimp_list_dispose            (GObject             *object);
-
 static gint64       gimp_list_get_memsize        (GimpObject          *object,
                                                   gint64              *gui_size);
 
@@ -104,8 +102,6 @@ gimp_list_class_init (GimpListClass *kla
 
   parent_class = g_type_class_peek_parent (klass);
 
-  object_class->dispose               = gimp_list_dispose;
-
   gimp_object_class->get_memsize      = gimp_list_get_memsize;
 
   container_class->add                = gimp_list_add;
@@ -125,17 +121,6 @@ gimp_list_init (GimpList *list)
   list->list = NULL;
 }
 
-static void
-gimp_list_dispose (GObject *object)
-{
-  GimpList *list = GIMP_LIST (object);
-
-  while (list->list)
-    gimp_container_remove (GIMP_CONTAINER (list), list->list->data);
-
-  G_OBJECT_CLASS (parent_class)->dispose (object);
-}
-
 static gint64
 gimp_list_get_memsize (GimpObject *object,
                        gint64     *gui_size)
Index: app/core/gimpcontainer.c
===================================================================
RCS file: /cvs/gnome/gimp/app/core/gimpcontainer.c,v
retrieving revision 1.53
diff -u -p -r1.53 gimpcontainer.c
--- app/core/gimpcontainer.c	18 Feb 2004 13:43:44 -0000	1.53
+++ app/core/gimpcontainer.c	16 Mar 2004 12:50:47 -0000
@@ -265,6 +265,8 @@ gimp_container_dispose (GObject *object)
 {
   GimpContainer *container = GIMP_CONTAINER (object);
 
+  gimp_container_clear (container);
+
   while (container->handlers)
     gimp_container_remove_handler (container,
                                    ((GimpContainerHandler *)