aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
Diffstat (limited to 'mail')
-rw-r--r--mail/ChangeLog5
-rw-r--r--mail/message-list.c6
2 files changed, 11 insertions, 0 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index e274211a65..b47e1a85ac 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,5 +1,10 @@
2000-10-29 Dan Winship <danw@helixcode.com>
+ * message-list.c (mail_do_regenerate_messagelist): Don't try to
+ regenerate the message list if there is no folder. (The Bonobo UI
+ code will call this as the callback for the "Threaded View"
+ command.)
+
* mail-ops.c (do_fetch_mail): Sync the folder before refreshing so
we don't lose flag settings.
diff --git a/mail/message-list.c b/mail/message-list.c
index ee2d3694e9..9c44d0a8df 100644
--- a/mail/message-list.c
+++ b/mail/message-list.c
@@ -1827,6 +1827,12 @@ void mail_do_regenerate_messagelist (MessageList *list, const gchar *search)
{
regenerate_messagelist_input_t *input;
+ /* This gets called on empty folder-browsers by the bonobo ui
+ * callback for threaded view.
+ */
+ if (!list->folder)
+ return;
+
input = g_new (regenerate_messagelist_input_t, 1);
input->ml = list;
input->search = g_strdup (search);