aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog9
-rw-r--r--mail/mail-vfolder.c8
2 files changed, 14 insertions, 3 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index b419c5ffef..5ece1f8e2c 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,12 @@
+2006-02-20 Parthasarathi Susarla <sparthasarathi@novell.com>
+
+ ** Fixes bug 33139
+
+ * mail-vfolder.c: (mail_vfolder_shutdown):
+ assign 'vfolder_hash' to NULL after destroying.
+
+ Committed Patch on behalf of Joe Marcus Clarke (marcus@freebsd.org)
+
2006-02-16 Srinivasa Ragavan <sragavan@novell.com>
** Fixes bug #331215
diff --git a/mail/mail-vfolder.c b/mail/mail-vfolder.c
index b258355c57..66b29de918 100644
--- a/mail/mail-vfolder.c
+++ b/mail/mail-vfolder.c
@@ -1189,9 +1189,11 @@ mail_vfolder_shutdown (void)
{
shutdown = 1;
- g_hash_table_foreach (vfolder_hash, vfolder_foreach_cb, NULL);
- g_hash_table_destroy (vfolder_hash);
- vfolder_hash = NULL;
+ if (vfolder_hash) {
+ g_hash_table_foreach (vfolder_hash, vfolder_foreach_cb, NULL);
+ g_hash_table_destroy (vfolder_hash);
+ vfolder_hash = NULL;
+ }
if (vfolder_store) {
camel_object_unref (vfolder_store);