diff options
| -rw-r--r-- | mail/ChangeLog | 6 | ||||
| -rw-r--r-- | mail/mail-callbacks.c | 9 |
2 files changed, 14 insertions, 1 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 63f4be97a7..d738f076bd 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,5 +1,11 @@ 2001-07-12 Jason Leach <jleach@ximian.com> + * 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 <jleach@ximian.com> + * mail-config.c (config_read): Should be saving the 'identity_html_signature' and 'identity_has_html_signature" keys in the /Mail/Accounts prefix (with the rest of the per-account 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); } |