aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog6
-rw-r--r--mail/message-list.c6
2 files changed, 11 insertions, 1 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 5f00dd6cec..cc5a2008ce 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,5 +1,11 @@
2001-06-05 Jason Leach <jleach@ximian.com>
+ (Fix bug #3211: Should undelete when flagging a delete message as
+ important)
+
+ * message-list.c (on_click): When flagging a message as important,
+ check to see if it's flagged as deleted, if so, undelete it.
+
(Fix bug #314: Display URLs in statusbar on mouseover)
* mail-display.c (html_on_url): New function, callback for
diff --git a/mail/message-list.c b/mail/message-list.c
index 0690a747c8..3ae49c8e35 100644
--- a/mail/message-list.c
+++ b/mail/message-list.c
@@ -2045,7 +2045,11 @@ on_click (ETree *tree, gint row, ETreePath path, gint col, GdkEvent *event, Mess
if (info == NULL) {
return FALSE;
}
-
+
+ /* If a message was marked as deleted and the user flags it as important, undelete it */
+ if (col == COL_FLAGGED && (info->flags & CAMEL_MESSAGE_DELETED))
+ flag |= CAMEL_MESSAGE_DELETED;
+
camel_folder_set_message_flags(list->folder, camel_message_info_uid(info), flag, ~info->flags);
if (flag == CAMEL_MESSAGE_SEEN && list->seen_id) {