[evolution] Bug 757654 - Add a button to archive the current/selected message

[Milan Crha <mcrha src gnome org>]

commit a6418bf05710d0ea0ed341a4fde2e0b58737402c
Author: Milan Crha <mcrha redhat com>
Date:   Thu Nov 12 15:29:29 2015 +0100

    Bug 757654 - Add a button to archive the current/selected message

 data/icons/Makefile.am                            |    2 ++
 data/icons/hicolor_actions_16x16_mail-archive.png |  Bin 0 -> 602 bytes
 data/icons/hicolor_actions_24x24_mail-archive.png |  Bin 0 -> 936 bytes
 mail/e-mail-reader.c                              |    2 +-
 ui/evolution-mail-reader.ui                       |    1 +
 5 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
index 68feb8a..23b72cc 100644
--- a/data/icons/Makefile.am
+++ b/data/icons/Makefile.am
@@ -66,6 +66,7 @@ private_icons = \
        hicolor_apps_scalable_im-yahoo.svg \
        hicolor_actions_16x16_folder-copy.png \
        hicolor_actions_16x16_folder-move.png \
+       hicolor_actions_16x16_mail-archive.png \
        hicolor_actions_16x16_mail-copy.png \
        hicolor_actions_16x16_mail-move.png \
        hicolor_actions_16x16_go-today.png \
@@ -81,6 +82,7 @@ private_icons = \
        hicolor_actions_22x22_view-calendar-week.png \
        hicolor_actions_22x22_view-calendar-workweek.png \
        hicolor_actions_24x24_go-today.png \
+       hicolor_actions_24x24_mail-archive.png \
        hicolor_actions_24x24_query-free-busy.png \
        hicolor_actions_24x24_view-calendar-day.png \
        hicolor_actions_24x24_view-calendar-list.png \
diff --git a/data/icons/hicolor_actions_16x16_mail-archive.png 
b/data/icons/hicolor_actions_16x16_mail-archive.png
new file mode 100644
index 0000000..9c309dc
Binary files /dev/null and b/data/icons/hicolor_actions_16x16_mail-archive.png differ
diff --git a/data/icons/hicolor_actions_24x24_mail-archive.png 
b/data/icons/hicolor_actions_24x24_mail-archive.png
new file mode 100644
index 0000000..746942b
Binary files /dev/null and b/data/icons/hicolor_actions_24x24_mail-archive.png differ
diff --git a/mail/e-mail-reader.c b/mail/e-mail-reader.c
index 5e3fd3f..d95c9ba 100644
--- a/mail/e-mail-reader.c
+++ b/mail/e-mail-reader.c
@@ -1968,7 +1968,7 @@ static GtkActionEntry mail_reader_entries[] = {
          G_CALLBACK (action_mail_add_sender_cb) },
 
        { "mail-archive",
-         NULL,
+         "mail-archive",
          N_("_Archive..."),
          "<Alt><Control>a",
          N_("Move selected messages to the Archive folder for the account"),
diff --git a/ui/evolution-mail-reader.ui b/ui/evolution-mail-reader.ui
index edc9fd1..a3b878f 100644
--- a/ui/evolution-mail-reader.ui
+++ b/ui/evolution-mail-reader.ui
@@ -142,6 +142,7 @@
       <toolitem action='mail-delete'/>
       <toolitem action='mail-mark-junk'/>
       <toolitem action='mail-mark-notjunk'/>
+      <toolitem action='mail-archive'/>
     </placeholder>
     <separator/>
     <placeholder name='mail-toolbar-navigation'>