lp://qastaging/~smspillaz/compiz-core/compiz-core.lim

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://qastaging/compiz-core at revision 3036

Daniel van Vugt: Approve on 2012-03-04

Alan Griffiths: Approve on 2012-02-28

Marco Trevisan (Treviño): Approve on 2012-02-28

Sam Spilsbury: Pending requested 2012-02-28

Diff: 1601 lines (+1218/-11)

16 files modified

gtk/window-decorator/CMakeLists.txt (+6/-0)
gtk/window-decorator/decorator.c (+32/-6)
gtk/window-decorator/events.c (+117/-3)
gtk/window-decorator/gtk-window-decorator.c (+59/-0)
gtk/window-decorator/gtk-window-decorator.h (+8/-1)
gtk/window-decorator/local-menus/CMakeLists.txt (+60/-0)
gtk/window-decorator/local-menus/src/local-menus.c (+438/-0)
gtk/window-decorator/local-menus/src/local-menus.h (+125/-0)
gtk/window-decorator/local-menus/tests/CMakeLists.txt (+3/-0)
gtk/window-decorator/local-menus/tests/check_local_menu_on_off/CMakeLists.txt (+21/-0)
gtk/window-decorator/local-menus/tests/check_local_menu_on_off/test-local-menu-on-off.cpp (+47/-0)
gtk/window-decorator/local-menus/tests/force_local_menu_on/CMakeLists.txt (+21/-0)
gtk/window-decorator/local-menus/tests/force_local_menu_on/test-force-local-menu-on.cpp (+89/-0)
gtk/window-decorator/local-menus/tests/test-local-menu.h (+106/-0)
gtk/window-decorator/metacity.c (+54/-0)
gtk/window-decorator/wnck.c (+32/-1)

api

Superseded for merging into lp://qastaging/compiz-core/0.9.5

Daniel van Vugt: Needs Resubmitting on 2012-02-06

Diff: 843 lines (+623/-8)

15 files modified

gtk/window-decorator/CMakeLists.txt (+6/-0)
gtk/window-decorator/decorator.c (+32/-6)
gtk/window-decorator/events.c (+48/-0)
gtk/window-decorator/gtk-window-decorator.h (+7/-1)
gtk/window-decorator/local-menus/CMakeLists.txt (+60/-0)
gtk/window-decorator/local-menus/src/local-menus.c (+200/-0)
gtk/window-decorator/local-menus/src/local-menus.h (+69/-0)
gtk/window-decorator/local-menus/tests/CMakeLists.txt (+3/-0)
gtk/window-decorator/local-menus/tests/check_local_menu_on_off/CMakeLists.txt (+21/-0)
gtk/window-decorator/local-menus/tests/check_local_menu_on_off/test-local-menu-on-off.cpp (+17/-0)
gtk/window-decorator/local-menus/tests/force_local_menu_on/CMakeLists.txt (+21/-0)
gtk/window-decorator/local-menus/tests/force_local_menu_on/test-force-local-menu-on.cpp (+67/-0)
gtk/window-decorator/local-menus/tests/test-local-menu.h (+48/-0)
gtk/window-decorator/metacity.c (+22/-0)
gtk/window-decorator/wnck.c (+2/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #682788: Improve Unity Global Menu	High	Fix Released
Bug #931245: Finish the implementation of the locally integrated menubars	Undecided	Won't Fix

Link a bug report

Related blueprints

3006. By Sam Spilsbury on 2012-03-02

Grab buttons too so that we can process motion events on the titlebar and
move the window instead.

3005. By Sam Spilsbury on 2012-03-02

We also need to test the property too

3004. By Sam Spilsbury on 2012-02-28

Merged lp:compiz-core

3003. By Sam Spilsbury on 2012-02-28

Tell us if we have them

3002. By Sam Spilsbury on 2012-02-28

Fix a crash when trying to show the window menu on a non decorated window

3001. By Sam Spilsbury on 2012-02-25

Fix build failure without META_HAS_LOCAL_MENUS

3000. By Sam Spilsbury on 2012-02-25

Fix placement of menus on alt-accelerator, remove debug messages

2999. By Sam Spilsbury on 2012-02-25

Fix memory error and menu button not showing

2998. By Sam Spilsbury on 2012-02-24

Merge lp:compiz-core and allow alt-accelerator to open menus as well as reading the xprop
to determine if local menus are applicable

2997. By Sam Spilsbury on 2012-02-22

Don't run global setup or teardown functions if no local menus