aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog6
-rw-r--r--mail/folder-browser.c7
2 files changed, 12 insertions, 1 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 737de40030..f9d923ce8e 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,9 @@
+2002-10-09 Jeffrey Stedfast <fejj@ximian.com>
+
+ * folder-browser.c (main_folder_changed): Don't do anything if the
+ message_list is NULL (this means the FolderBrowser has been
+ destroyed). Fixes bug #32002.
+
2002-10-08 Jeffrey Stedfast <fejj@ximian.com>
* component-factory.c (storage_remove_folder): The CamelFolderInfo
diff --git a/mail/folder-browser.c b/mail/folder-browser.c
index fb58220e7f..f0cbb7eef5 100644
--- a/mail/folder-browser.c
+++ b/mail/folder-browser.c
@@ -800,8 +800,10 @@ static gboolean
update_status_bar_idle_cb(gpointer data)
{
FolderBrowser *fb = data;
+
if (!GTK_OBJECT_DESTROYED (fb))
update_status_bar (fb);
+
fb->update_status_bar_idle_id = 0;
gtk_object_unref (GTK_OBJECT (fb));
return FALSE;
@@ -819,7 +821,10 @@ update_status_bar_idle(FolderBrowser *fb)
static void main_folder_changed(CamelObject *o, void *event_data, void *data)
{
FolderBrowser *fb = data;
-
+
+ if (fb->message_list == NULL)
+ return;
+
/* so some corba unref doesnt blow us away while we're busy */
gtk_object_ref((GtkObject *)fb);
update_status_bar(fb);