aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog4
-rw-r--r--mail/message-list.c4
2 files changed, 5 insertions, 3 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 6cd9bacc51..052883b8da 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,5 +1,9 @@
2001-08-21 Peter Williams <peterw@ximian.com>
+ * message-list.c (message_list_set_folder): Don't sink the extras since
+ _set_folder can get called more than once (on reconfigure.)
+ (message_list_destroy): So just unref the extras here.
+
* mail-send-recv.c (build_dialogue): Treat the spool provider like IMAP:
update instead of performing an explicit receive.
diff --git a/mail/message-list.c b/mail/message-list.c
index 7711130e48..12deb78495 100644
--- a/mail/message-list.c
+++ b/mail/message-list.c
@@ -1131,6 +1131,7 @@ message_list_destroy (GtkObject *object)
camel_object_unref (CAMEL_OBJECT (message_list->folder));
}
+ gtk_object_unref (GTK_OBJECT (message_list->extras));
gtk_object_unref (GTK_OBJECT (message_list->model));
if (message_list->idle_id != 0)
@@ -1948,9 +1949,6 @@ message_list_set_folder (MessageList *message_list, CamelFolder *camel_folder, g
NULL);
}
- /* Now we're finally done with the extras */
- gtk_object_sink (GTK_OBJECT (message_list->extras));
-
/* Build the etree suitable for this folder */
message_list_setup_etree (message_list, outgoing);