From b1971b08cd80e57bf20b1a4d7e289de22bff54de Mon Sep 17 00:00:00 2001
From: Peter Williams <peterw@ximian.com>
Date: Mon, 26 Aug 2002 21:19:07 +0000
Subject: Logic change for when untoggling a message from deleted-dom.
2002-08-26 Peter Williams <peterw@ximian.com>
* mail-callbacks.c (toggle_flags): Logic change for when untoggling
a message from deleted-dom.
svn path=/trunk/; revision=17869
---
mail/ChangeLog | 5 +++++
mail/mail-callbacks.c | 6 ++++--
2 files changed, 9 insertions(+), 2 deletions(-)
(limited to 'mail')
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 15269754f0..1ddb3d586e 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,8 @@
+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
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;
}
--
cgit v1.2.3