[geary] Switch search and main menu order back to normal

[Michael Gratton <mjog src gnome org>]

commit b24ac8061c3d90f7a2742764ed9e5950ea908cc2
Author: Michael Gratton <mike vee net>
Date:   Fri Apr 26 18:30:18 2019 +1000

    Switch search and main menu order back to normal
    
    Fixes #405

 ui/main-toolbar.ui | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)
---
diff --git a/ui/main-toolbar.ui b/ui/main-toolbar.ui
index 72549aab..dcbc4c91 100644
--- a/ui/main-toolbar.ui
+++ b/ui/main-toolbar.ui
@@ -33,44 +33,44 @@
           </object>
         </child>
         <child>
-          <object class="GtkToggleButton" id="search_conversations_button">
+          <object class="GtkMenuButton" id="main_menu_button">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="focus_on_click">False</property>
             <property name="receives_default">False</property>
-            <property name="tooltip_text" translatable="yes">Toggle search bar</property>
             <property name="always_show_image">True</property>
             <child>
-              <object class="GtkImage" id="search_conversations_image">
+              <object class="GtkImage" id="main_menu_image">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="icon_name">preferences-system-search-symbolic</property>
+                <property name="icon_name">open-menu-symbolic</property>
               </object>
             </child>
           </object>
           <packing>
             <property name="pack_type">end</property>
-            <property name="position">3</property>
+            <property name="position">1</property>
           </packing>
         </child>
         <child>
-          <object class="GtkMenuButton" id="main_menu_button">
+          <object class="GtkToggleButton" id="search_conversations_button">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="focus_on_click">False</property>
             <property name="receives_default">False</property>
+            <property name="tooltip_text" translatable="yes">Toggle search bar</property>
             <property name="always_show_image">True</property>
             <child>
-              <object class="GtkImage" id="main_menu_image">
+              <object class="GtkImage" id="search_conversations_image">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="icon_name">open-menu-symbolic</property>
+                <property name="icon_name">preferences-system-search-symbolic</property>
               </object>
             </child>
           </object>
           <packing>
             <property name="pack_type">end</property>
-            <property name="position">2</property>
+            <property name="position">3</property>
           </packing>
         </child>
         <style>
@@ -91,6 +91,8 @@
         <property name="orientation">vertical</property>
       </object>
       <packing>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
         <property name="position">1</property>
       </packing>
     </child>
@@ -363,4 +365,3 @@
     </child>
   </template>
 </interface>
-