diff options
author | Christian Dywan <christian.dywan@canonical.com> | 2015-06-13 10:31:23 -0400 |
---|---|---|
committer | Christian Dywan <christian.dywan@canonical.com> | 2015-06-13 10:31:23 -0400 |
commit | 1e811009baafc11ca6a6b60f5042633163a87b00 (patch) | |
tree | 46174b15c45b9c47547950dcf193e9436c7751cf /midori | |
parent | 89cf9fefbe50ec8deb5edec10cce8a02cad7a2ee (diff) | |
download | midori-git-1e811009baafc11ca6a6b60f5042633163a87b00.tar.gz |
Always include app menu in toolbar
Diffstat (limited to 'midori')
-rw-r--r-- | midori/midori-window.vala | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/midori/midori-window.vala b/midori/midori-window.vala index 38df3a4a..595ac75b 100644 --- a/midori/midori-window.vala +++ b/midori/midori-window.vala @@ -125,7 +125,14 @@ namespace Midori { 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 @@ namespace Midori { } 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); |