Merge lp:~gue5t/midori/appmenu-menubar-binding into lp:midori

[gue5t gue5t]

fix property binding to ensure that exactly one of appmenu button and menubar is always visible

As of a recent commit, the appmenu icon is always visible in the toolbar. This is because the property binding intended to control its visibility was only set if the *window*'s name was "CompactMenu", rather than checking if the action being created by the window was named that.

In addition, the binding needed to invert the boolean to ensure that if the menubar is shown, the appmenu is *not* visible. This patch makes it work as intended.

[Cris Dywan (kalikiana)]

Good catch. I completely didn't realize that it would've been using the window's name.

review: Approve

=== modified file 'midori/midori-window.vala'
--- midori/midori-window.vala	2015-07-07 23:03:47 +0000
+++ midori/midori-window.vala	2015-08-10 00:01:41 +0000
@@ -90,8 +90,9 @@
                 toolitem.is_important = true;
             toolitem.get_child ().button_press_event.connect ((event) => {
                 return event.button == 3 && context_menu (toolitem, action); });
-            if (name == "CompactMenu")
-                bind_property ("show-menubar", toolitem, "visible");
+            if (action.name == "CompactMenu")
+                bind_property ("show-menubar", toolitem, "visible",
+                BindingFlags.DEFAULT|BindingFlags.INVERT_BOOLEAN);
             return toolitem;
         }