Merge lp:~gue5t/midori/appmenu-initial-visibility into lp:midori

[gue5t gue5t]

Make sure that only one of appmenu and menubar are visible *initially* as well as when changed

The previous fix here didn't set the visibility of the appmenu action on browser creation but only on change to menubar visibility. This is easy to not notice since new configuration directories enable the appmenu and not the menubar, but if you enable the menubar and restart Midori the problem becomes apparent.

This fixes visibility from startup onward.

[Cris Dywan (kalikiana)]

Can we unit test this? Given the non-obvious semantics (and I used to think it was a lot more straight-forward myself).

review: Needs Information

[Cris Dywan (kalikiana)]

Let's not block on tests for now.

review: Approve

=== modified file 'midori/midori-window.vala'
--- midori/midori-window.vala	2015-08-09 23:55:57 +0000
+++ midori/midori-window.vala	2015-08-11 00:02:08 +0000
@@ -91,8 +91,11 @@
             toolitem.get_child ().button_press_event.connect ((event) => {
                 return event.button == 3 && context_menu (toolitem, action); });
             if (action.name == "CompactMenu")
+            {
+                toolitem.visible = !show_menubar;
                 bind_property ("show-menubar", toolitem, "visible",
-                BindingFlags.DEFAULT|BindingFlags.INVERT_BOOLEAN);
+                    BindingFlags.DEFAULT | BindingFlags.INVERT_BOOLEAN);
+            }
             return toolitem;
         }