[evolution] Extend "delete-selects-previous" mail option to cover mark junk/not-junk too

[Milan Crha <mcrha src gnome org>]

commit d0f9a44e28c52a843104f9344d762ba8342d6399
Author: Milan Crha <mcrha redhat com>
Date:   Thu Nov 30 10:54:46 2017 +0100

    Extend "delete-selects-previous" mail option to cover mark junk/not-junk too

 src/mail/e-mail-reader.c |   16 ++++++++++++----
 1 files changed, 12 insertions(+), 4 deletions(-)
---
diff --git a/src/mail/e-mail-reader.c b/src/mail/e-mail-reader.c
index 2de0eb2..8930024 100644
--- a/src/mail/e-mail-reader.c
+++ b/src/mail/e-mail-reader.c
@@ -837,8 +837,12 @@ action_mail_mark_junk_cb (GtkAction *action,
                CAMEL_MESSAGE_JUNK |
                CAMEL_MESSAGE_JUNK_LEARN;
 
-       if (e_mail_reader_mark_selected (reader, mask, set) != 0)
-               e_mail_reader_select_next_message (reader, TRUE);
+       if (e_mail_reader_mark_selected (reader, mask, set) != 0) {
+               if (e_mail_reader_get_delete_selects_previous (reader))
+                       e_mail_reader_select_previous_message (reader, TRUE);
+               else
+                       e_mail_reader_select_next_message (reader, TRUE);
+       }
 }
 
 static void
@@ -853,8 +857,12 @@ action_mail_mark_notjunk_cb (GtkAction *action,
                CAMEL_MESSAGE_NOTJUNK |
                CAMEL_MESSAGE_JUNK_LEARN;
 
-       if (e_mail_reader_mark_selected (reader, mask, set) != 0)
-               e_mail_reader_select_next_message (reader, TRUE);
+       if (e_mail_reader_mark_selected (reader, mask, set) != 0) {
+               if (e_mail_reader_get_delete_selects_previous (reader))
+                       e_mail_reader_select_previous_message (reader, TRUE);
+               else
+                       e_mail_reader_select_next_message (reader, TRUE);
+       }
 }
 
 static void