[geary: 23/39] Start the final part of bug 713991.

[Michael Gratton <mjog src gnome org>]

commit 97ce3d09cdc8ae72d0b254e8e758002ef63ad85a
Author: Niels De Graef <nielsdegraef gmail com>
Date:   Mon May 15 23:21:32 2017 +0200

    Start the final part of bug 713991.
    
    * Ported Gtk.Action to GLib.Action in the GearyController.
    * Removed Gtk.AccelGroups (handled through Gtk.Application now).
    * Got rid of Gtk.UiManager (now all is done through Gtk.Builder).
    * Throw away workaround for conflicting Gtk.Actions in ComposerContainer.
    * Aggregate zoom in/out/normal into one parameterized zoom action.
    
    Signed-off-by: Niels De Graef <nielsdegraef gmail com>

 ui/main-toolbar.ui |   27 +++++++++++++++++++++++++--
 1 files changed, 25 insertions(+), 2 deletions(-)
---
diff --git a/ui/main-toolbar.ui b/ui/main-toolbar.ui
index 030f59c..9850ac2 100644
--- a/ui/main-toolbar.ui
+++ b/ui/main-toolbar.ui
@@ -22,6 +22,7 @@
             <property name="receives_default">False</property>
             <property name="action_name">win.new-message</property>
             <property name="always_show_image">True</property>
+            <property name="action_name">win.new-message</property>
             <child>
               <object class="GtkImage" id="compose_new_message_image">
                 <property name="can_focus">False</property>
@@ -49,6 +50,7 @@
             <property name="receives_default">False</property>
             <property name="tooltip_text" translatable="yes">Toggle search bar</property>
             <property name="always_show_image">True</property>
+            <property name="tooltip_text" translatable="yes">Toggle search bar</property>
             <child>
               <object class="GtkImage" id="search_conversations_image">
                 <property name="can_focus">False</property>
@@ -109,6 +111,8 @@
                 <property name="tooltip_text" translatable="yes">Reply</property>
                 <property name="action_name">win.reply-to-message</property>
                 <property name="always_show_image">True</property>
+                <property name="tooltip_text" translatable="yes">Reply</property>
+                <property name="action_name">win.reply-to-message</property>
                 <child>
                   <object class="GtkImage" id="reply_sender_image">
                     <property name="can_focus">False</property>
@@ -131,6 +135,8 @@
                 <property name="tooltip_text" translatable="yes">Reply All</property>
                 <property name="action_name">win.reply-all-message</property>
                 <property name="always_show_image">True</property>
+                <property name="tooltip_text" translatable="yes">Reply All</property>
+                <property name="action_name">win.reply-all-message</property>
                 <child>
                   <object class="GtkImage" id="reply_all_image">
                     <property name="can_focus">False</property>
@@ -153,6 +159,8 @@
                 <property name="tooltip_text" translatable="yes">Forward</property>
                 <property name="action_name">win.forward-message</property>
                 <property name="always_show_image">True</property>
+                <property name="tooltip_text" translatable="yes">Forward</property>
+                <property name="action_name">win.forward-message</property>
                 <child>
                   <object class="GtkImage" id="forward_image">
                     <property name="can_focus">False</property>
@@ -184,6 +192,7 @@
                 <property name="receives_default">False</property>
                 <property name="action_name">win.mark-message-menu</property>
                 <property name="always_show_image">True</property>
+                <property name="action_name">win.mark-message-menu</property>
                 <child>
                   <object class="GtkImage" id="mark_message_image">
                     <property name="can_focus">False</property>
@@ -198,7 +207,7 @@
               </packing>
             </child>
             <child>
-              <object class="GtkMenuButton" id="copy_message_button">
+              <object class="GtkMenuButton" id="move_message_button">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="focus_on_click">False</property>
@@ -218,7 +227,7 @@
               </packing>
             </child>
             <child>
-              <object class="GtkMenuButton" id="move_message_button">
+              <object class="GtkMenuButton" id="copy_message_button">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="focus_on_click">False</property>
@@ -254,6 +263,7 @@
             <property name="receives_default">False</property>
             <property name="tooltip_text" translatable="yes">Toggle find bar</property>
             <property name="always_show_image">True</property>
+            <property name="tooltip_text" translatable="yes">Toggle find bar</property>
             <child>
               <object class="GtkImage" id="find_image">
                 <property name="can_focus">False</property>
@@ -274,6 +284,7 @@
             <property name="receives_default">False</property>
             <property name="action_name">win.undo</property>
             <property name="always_show_image">True</property>
+            <property name="action_name">win.undo</property>
             <child>
               <object class="GtkImage" id="undo_image">
                 <property name="can_focus">False</property>
@@ -301,6 +312,12 @@
                 <property name="image">archive_image</property>
                 <property name="use_underline">True</property>
                 <property name="always_show_image">True</property>
+                <property name="action_name">win.archive-conv</property>
+                <child>
+                  <object class="GtkImage" id="archive_image">
+                    <property name="icon_name">mail-archive-symbolic</property>
+                  </object>
+                </child>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -316,9 +333,15 @@
                 <property name="receives_default">False</property>
                 <property name="action_name">win.trash-conv</property>
                 <property name="always_show_image">True</property>
+<<<<<<< HEAD
                 <child>
                   <object class="GtkImage" id="trash_delete_image">
                     <property name="can_focus">False</property>
+=======
+                <property name="action_name">win.trash-conv</property>
+                <child>
+                  <object class="GtkImage" id="trash_delete_image">
+>>>>>>> Start the final part of bug 713991.
                     <property name="icon_name">user-trash-symbolic</property>
                   </object>
                 </child>