Merge lp://qastaging/~dbarth/appmenu-gtk/local-fallback into lp://qastaging/appmenu-gtk/0.4
Status: | Merged |
---|---|
Merged at revision: | 66 |
Proposed branch: | lp://qastaging/~dbarth/appmenu-gtk/local-fallback |
Merge into: | lp://qastaging/appmenu-gtk/0.4 |
Diff against target: |
15 lines (+4/-1) 1 file modified
src/bridge.c (+4/-1) |
To merge this branch: | bzr merge lp://qastaging/~dbarth/appmenu-gtk/local-fallback |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Neil J. Patel | Pending | ||
Review via email: mp+31311@code.qastaging.launchpad.net |
Description of the change
This patch along with a change to set show-local to FALSE in gtk by default prevents flicker at application startup, yet avoids being trapped with an menu-less application window.
To test:
1. remove the appmenu applet and unset APPMENU_
2. run gedit, notice the menubar is displayed in the app. window itself
3. add the appmenu applet; confirm the embedded menubar goes away as the panel menubar appears
4. remove the appmenu applet; confirm the embedded menubar reappears
2nd phase:
1. make sure an appmenu applet is loaded and unset APPMENU_
2. run gedit; notice that no embedded menubar appears anymore, hence suppressing the startup flicker from the previous patch
makes sense, approved.