Merge lp:~midori/midori/lostHamburger into lp:midori

[Cris Dywan]

Always include app menu in toolbar

[Paweł Forysiuk (tuxator)]

review: Approve

=== modified file 'midori/midori-window.vala'
--- midori/midori-window.vala	2015-06-12 22:04:05 +0000
+++ midori/midori-window.vala	2015-06-13 14:33:18 +0000
@@ -125,7 +125,14 @@
             foreach (unowned Gtk.Widget toolitem in container.get_children ())
                 container.remove (toolitem);
 
-            string[] names = actions.replace ("CompactMenu", extra_actions + ",CompactMenu").split (",");
+            /* Always include app menu (visible depending on menubar) and extensions. */
+            string all_actions;
+            if ("CompactMenu" in actions)
+                all_actions = actions.replace ("CompactMenu", extra_actions + ",CompactMenu");
+            else
+                all_actions = actions + "," + extra_actions + ",CompactMenu";
+            string[] names = all_actions.split (",");
+
 #if HAVE_GTK3
             var headerbar = _toolbar as Gtk.HeaderBar;
             if (headerbar != null) {
@@ -147,9 +154,7 @@
                     } else if (name == "Search") {
                         ((Gtk.Entry)widget).width_chars = 12;
                         tail.append (toolitem);
-                    } else if (actions.index_of (name) > actions.index_of ("Location"))
-                        tail.append (toolitem);
-                    else if (name in extra_actions)
+                    } else if (all_actions.index_of (name) > all_actions.index_of ("Location"))
                         tail.append (toolitem);
                     else
                         headerbar.pack_start (toolitem);