diff options
| -rw-r--r-- | e-util/ChangeLog | 9 | ||||
| -rw-r--r-- | e-util/e-categories-master-list-wombat.c | 3 | ||||
| -rw-r--r-- | e-util/e-list-iterator.c | 5 | ||||
| -rw-r--r-- | e-util/e-list.c | 3 |
4 files changed, 19 insertions, 1 deletions
diff --git a/e-util/ChangeLog b/e-util/ChangeLog index dbd507943b..d8a843f40b 100644 --- a/e-util/ChangeLog +++ b/e-util/ChangeLog @@ -1,3 +1,12 @@ +2001-08-09 Federico Mena Quintero <federico@ximian.com> + + * e-categories-master-list-wombat.c (ecmlw_destroy): Chain to the + destroy handler in the parent class! + + * e-list-iterator.c (e_list_iterator_destroy): Likewise. Sigh. + + * e-list.c (e_list_destroy): Likewise. Double sigh. + 2001-08-08 Ettore Perazzoli <ettore@ximian.com> * e-dialog-utils.h: New. diff --git a/e-util/e-categories-master-list-wombat.c b/e-util/e-categories-master-list-wombat.c index 4cf8e78879..6eb0a2562d 100644 --- a/e-util/e-categories-master-list-wombat.c +++ b/e-util/e-categories-master-list-wombat.c @@ -123,6 +123,9 @@ ecmlw_destroy (GtkObject *object) bonobo_object_release_unref (ecmlw->priv->db, &ev); CORBA_exception_free (&ev); + + if (GTK_OBJECT_CLASS (parent_class)->destroy) + (* GTK_OBJECT_CLASS (parent_class)->destroy) (object); } diff --git a/e-util/e-list-iterator.c b/e-util/e-list-iterator.c index 64f7c299f3..7d3d644fc2 100644 --- a/e-util/e-list-iterator.c +++ b/e-util/e-list-iterator.c @@ -33,7 +33,7 @@ static void e_list_iterator_destroy (GtkObject *object); #define PARENT_TYPE (e_iterator_get_type ()) -static GtkObjectClass *parent_class; +static EIteratorClass *parent_class; #define PARENT_CLASS (E_ITERATOR_CLASS(parent_class)) /** @@ -124,6 +124,9 @@ e_list_iterator_destroy (GtkObject *object) EListIterator *iterator = E_LIST_ITERATOR(object); e_list_remove_iterator(iterator->list, E_ITERATOR(iterator)); gtk_object_unref(GTK_OBJECT(iterator->list)); + + if (GTK_OBJECT_CLASS (parent_class)->destroy) + (* GTK_OBJECT_CLASS (parent_class)->destroy) (object); } static const void * diff --git a/e-util/e-list.c b/e-util/e-list.c index f501be5ae5..64ccea728c 100644 --- a/e-util/e-list.c +++ b/e-util/e-list.c @@ -172,5 +172,8 @@ e_list_destroy (GtkObject *object) EList *list = E_LIST(object); g_list_foreach(list->list, (GFunc) list->free, list->closure); g_list_free(list->list); + + if (GTK_OBJECT_CLASS (parent_class)->destroy) + (* GTK_OBJECT_CLASS (parent_class)->destroy) (object); } |