[evolution/wip/webkit2] Bug 760520 - Reorder items in Mail Show: combo box

[Milan Crha <mcrha src gnome org>]

commit 007d40977f74777016650dd2b4fcc72dff43f4fc
Author: Milan Crha <mcrha redhat com>
Date:   Fri Jan 29 15:03:49 2016 +0100

    Bug 760520 - Reorder items in Mail Show: combo box

 modules/mail/e-mail-shell-view-actions.c |    2 +-
 modules/mail/e-mail-shell-view-private.h |   21 ++++++++++-----------
 2 files changed, 11 insertions(+), 12 deletions(-)
---
diff --git a/modules/mail/e-mail-shell-view-actions.c b/modules/mail/e-mail-shell-view-actions.c
index 51216a7..243e5a3 100644
--- a/modules/mail/e-mail-shell-view-actions.c
+++ b/modules/mail/e-mail-shell-view-actions.c
@@ -2626,7 +2626,7 @@ e_mail_shell_view_update_search_filter (EMailShellView *mail_shell_view)
        /* Use any action in the group; doesn't matter which. */
        e_action_combo_box_set_action (combo_box, radio_action);
 
-       ii = MAIL_FILTER_UNREAD_MESSAGES;
+       ii = MAIL_FILTER_MESSAGES_NOT_JUNK;
        e_action_combo_box_add_separator_after (combo_box, ii);
 
        ii = MAIL_FILTER_READ_MESSAGES;
diff --git a/modules/mail/e-mail-shell-view-private.h b/modules/mail/e-mail-shell-view-private.h
index a176835..39ae23d 100644
--- a/modules/mail/e-mail-shell-view-private.h
+++ b/modules/mail/e-mail-shell-view-private.h
@@ -73,19 +73,18 @@ G_BEGIN_DECLS
 
 /* Filter items are displayed in ascending order.
  * Labels are numbered from zero, so subsequent items must have
- * sufficiently large values.  Unfortunately this introduces an
- * arbitrary upper bound on labels. */
+ * sufficiently large/small values. */
 enum {
-       MAIL_FILTER_ALL_MESSAGES = -3,
-       MAIL_FILTER_UNREAD_MESSAGES = -2,
-       MAIL_FILTER_NO_LABEL = -1,
+       MAIL_FILTER_ALL_MESSAGES = -20,
+       MAIL_FILTER_UNREAD_MESSAGES = -19,
+       MAIL_FILTER_READ_MESSAGES = -18,
+       MAIL_FILTER_LAST_5_DAYS_MESSAGES = -17,
+       MAIL_FILTER_MESSAGES_WITH_ATTACHMENTS = -16,
+       MAIL_FILTER_MESSAGES_WITH_NOTES = -15,
+       MAIL_FILTER_IMPORTANT_MESSAGES = -14,
+       MAIL_FILTER_MESSAGES_NOT_JUNK = -13,
+       MAIL_FILTER_NO_LABEL = -12
        /* Labels go here */
-       MAIL_FILTER_READ_MESSAGES = 5000,
-       MAIL_FILTER_LAST_5_DAYS_MESSAGES = 5001,
-       MAIL_FILTER_MESSAGES_WITH_ATTACHMENTS = 5002,
-       MAIL_FILTER_MESSAGES_WITH_NOTES = 5003,
-       MAIL_FILTER_IMPORTANT_MESSAGES = 5004,
-       MAIL_FILTER_MESSAGES_NOT_JUNK = 5005
 };
 
 /* Search items are displayed in ascending order. */