diff options
| -rw-r--r-- | mail/ChangeLog | 5 | ||||
| -rw-r--r-- | mail/mail-callbacks.c | 6 |
2 files changed, 9 insertions, 2 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 15269754f0..1ddb3d586e 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,5 +1,10 @@ 2002-08-26 Peter Williams <peterw@ximian.com> + * mail-callbacks.c (toggle_flags): Logic change for when untoggling + a message from deleted-dom. + +2002-08-26 Peter Williams <peterw@ximian.com> + * mail-ops.c (transfer_messages_transfer): Enforce the mailer policy that deleted messages are marked as seen. Fixes 29448. This could go in camel_folder_transfer_messages_to, but I don't think we diff --git a/mail/mail-callbacks.c b/mail/mail-callbacks.c index a72de4389b..4a0dd5646d 100644 --- a/mail/mail-callbacks.c +++ b/mail/mail-callbacks.c @@ -1997,8 +1997,10 @@ toggle_flags (FolderBrowser *fb, guint32 mask) mask |= CAMEL_MESSAGE_DELETED; } - /* if we're flagging a message deleted, always mark it seen too */ - if (mask & flags & CAMEL_MESSAGE_DELETED) { + /* if we're flagging a message deleted, mark it seen. If + * we're undeleting it, we also want it to be seen, so always do this. + */ + if (mask & CAMEL_MESSAGE_DELETED) { flags |= CAMEL_MESSAGE_SEEN; mask |= CAMEL_MESSAGE_SEEN; } |