From a6d46c33f31037bd8eb678368e88653786484532 Mon Sep 17 00:00:00 2001 From: Iain Holmes Date: Mon, 27 Aug 2001 20:19:49 +0000 Subject: Destroy lists and hashes when needed, so that old data isn't left behind. svn path=/trunk/; revision=12488 --- mail/ChangeLog | 5 +++++ mail/mail-config-druid.c | 22 +++++++++++++++++++++- 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/mail/ChangeLog b/mail/ChangeLog index 4d86ac1e1a..5aa43e2942 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,8 @@ +2001-08-27 Iain Holmes + + * mail-config-druid.c (druid_finish): Free the list and hash table. + (druid_cancel): Free the list and hash table. + 2001-08-27 Jeffrey Stedfast * mail-account-gui.c (mail_account_gui_new): Set the source and diff --git a/mail/mail-config-druid.c b/mail/mail-config-druid.c index 02834761c5..4fe0a88b21 100644 --- a/mail/mail-config-druid.c +++ b/mail/mail-config-druid.c @@ -177,7 +177,17 @@ druid_cancel (GnomeDruid *druid, gpointer user_data) GNOME_Evolution_Wizard_notifyAction (wiz, 0, GNOME_Evolution_Wizard_CANCEL, &ev); CORBA_exception_free (&ev); - + + if (page_list != NULL) { + g_list_free (page_list); + page_list = NULL; + } + + if (page_hash != NULL) { + g_hash_table_destroy (page_hash); + page_hash = NULL; + } + gtk_widget_destroy (GTK_WIDGET (config)); } @@ -187,6 +197,16 @@ druid_finish (GnomeDruidPage *page, gpointer arg1, gpointer user_data) MailConfigDruid *druid = user_data; gtk_object_set_data (GTK_OBJECT (account_wizard), "account-data", NULL); + if (page_list != NULL) { + g_list_free (page_list); + page_list = NULL; + } + + if (page_hash != NULL) { + g_hash_table_destroy (page_hash); + page_hash = NULL; + } + gtk_widget_destroy (GTK_WIDGET (druid)); } -- cgit v1.2.3