[geary] Fix the headerbar not showing in Unity. Bug 775865.

[Niels De Graef <nielsdg src gnome org>]

commit 40f15d2ab208475584b87cb86145b89a4dfa2ee1
Author: Niels De Graef <nielsdegraef gmail com>
Date:   Sun Dec 11 19:27:42 2016 +0100

    Fix the headerbar not showing in Unity. Bug 775865.

 src/client/components/main-window.vala |    3 +++
 ui/main-window.ui                      |    1 +
 2 files changed, 4 insertions(+), 0 deletions(-)
---
diff --git a/src/client/components/main-window.vala b/src/client/components/main-window.vala
index a2c9a14..908b2ff 100644
--- a/src/client/components/main-window.vala
+++ b/src/client/components/main-window.vala
@@ -32,6 +32,8 @@ public class MainWindow : Gtk.ApplicationWindow {
     public StatusBar status_bar { get; private set; default = new StatusBar(); }
     private MonitoredSpinner spinner = new MonitoredSpinner();
     [GtkChild]
+    private Gtk.Box main_layout;
+    [GtkChild]
     private Gtk.Box search_bar_box;
     [GtkChild]
     private Gtk.Paned folder_paned;
@@ -176,6 +178,7 @@ public class MainWindow : Gtk.ApplicationWindow {
             };
             bind_property("current-folder", this, "title", BindingFlags.SYNC_CREATE, title_func);
             main_toolbar.bind_property("account", this, "title", BindingFlags.SYNC_CREATE, title_func);
+            main_layout.pack_start(main_toolbar, false, true, 0);
         } else {
             main_toolbar.show_close_button = true;
             set_titlebar(main_toolbar);
diff --git a/ui/main-window.ui b/ui/main-window.ui
index f61c55a..a24070c 100644
--- a/ui/main-window.ui
+++ b/ui/main-window.ui
@@ -122,6 +122,7 @@
             </child>
           </object>
           <packing>
+            <property name="pack_type">end</property>
             <property name="expand">True</property>
             <property name="fill">True</property>
           </packing>