From 74042027db990bf5fc420a70076281221a30cfcf Mon Sep 17 00:00:00 2001 From: Jason Leach Date: Thu, 12 Jul 2001 18:28:03 +0000 Subject: Only blank the mail display if the message being viewed is one of those to 2001-07-12 Jason Leach * mail-callbacks.c (expunge_folder): Only blank the mail display if the message being viewed is one of those to be expunged. Bug #4030. svn path=/trunk/; revision=11052 --- mail/ChangeLog | 6 ++++++ mail/mail-callbacks.c | 9 ++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) (limited to 'mail') diff --git a/mail/ChangeLog b/mail/ChangeLog index 63f4be97a7..d738f076bd 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,9 @@ +2001-07-12 Jason Leach + + * mail-callbacks.c (expunge_folder): Only blank the mail display + if the message being viewed is one of those to be expunged. Bug + #4030. + 2001-07-12 Jason Leach * mail-config.c (config_read): Should be saving the diff --git a/mail/mail-callbacks.c b/mail/mail-callbacks.c index 899daf6b4f..f67f1a08a1 100644 --- a/mail/mail-callbacks.c +++ b/mail/mail-callbacks.c @@ -1634,7 +1634,14 @@ expunge_folder (BonoboUIComponent *uih, void *user_data, const char *path) if (fb->folder && (fb->expunging == NULL || fb->folder != fb->expunging)) { - mail_display_set_message(fb->mail_display, NULL); + CamelMessageInfo *info; + + /* Only blank the mail display if the message being + viewed is one of those to be expunged */ + info = camel_folder_get_message_info (fb->folder, fb->loaded_uid); + if (info->flags & CAMEL_MESSAGE_DELETED) + mail_display_set_message (fb->mail_display, NULL); + fb->expunging = fb->folder; mail_expunge_folder(fb->folder, expunged_folder, fb); } -- cgit v1.2.3