aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog7
-rw-r--r--mail/em-folder-view.c6
2 files changed, 10 insertions, 3 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 65ea871e64..1c343b56d2 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,10 @@
+2008-02-11 Milan Crha <mcrha@redhat.com>
+
+ ** Fix for bug #515054
+
+ * em-folder-view.c: (emfv_popup_mark_junk), (emfv_popup_mark_nojunk):
+ Also clear/set new CAMEL_MESSAGE_NOTJUNK flag.
+
2008-02-10 Srinivasa Ragavan <sragavan@novell.com>
** Fix for bug #411576
diff --git a/mail/em-folder-view.c b/mail/em-folder-view.c
index c932f0fb28..cd31926862 100644
--- a/mail/em-folder-view.c
+++ b/mail/em-folder-view.c
@@ -1027,7 +1027,7 @@ emfv_popup_mark_junk (EPopup *ep, EPopupItem *pitem, void *data)
int count;
count = em_folder_view_mark_selected(emfv,
- CAMEL_MESSAGE_SEEN|CAMEL_MESSAGE_JUNK|CAMEL_MESSAGE_JUNK_LEARN,
+ CAMEL_MESSAGE_SEEN|CAMEL_MESSAGE_JUNK|CAMEL_MESSAGE_NOTJUNK|CAMEL_MESSAGE_JUNK_LEARN,
CAMEL_MESSAGE_SEEN|CAMEL_MESSAGE_JUNK|CAMEL_MESSAGE_JUNK_LEARN);
emfv_select_next_message (emfv, count, TRUE);
@@ -1040,8 +1040,8 @@ emfv_popup_mark_nojunk (EPopup *ep, EPopupItem *pitem, void *data)
int count;
count = em_folder_view_mark_selected(emfv,
- CAMEL_MESSAGE_JUNK|CAMEL_MESSAGE_JUNK_LEARN,
- CAMEL_MESSAGE_JUNK_LEARN);
+ CAMEL_MESSAGE_JUNK|CAMEL_MESSAGE_NOTJUNK|CAMEL_MESSAGE_JUNK_LEARN,
+ CAMEL_MESSAGE_NOTJUNK|CAMEL_MESSAGE_JUNK_LEARN);
emfv_select_next_message (emfv, count, TRUE);
}