Merge lp://qastaging/~compiz-team/compiz/compiz.gtk-window-decorator.fix-metacity-cairo into lp://qastaging/compiz/0.9.8
| Status: | Superseded | ||||
|---|---|---|---|---|---|
| Proposed branch: | lp://qastaging/~compiz-team/compiz/compiz.gtk-window-decorator.fix-metacity-cairo | ||||
| Merge into: | lp://qastaging/compiz/0.9.8 | ||||
| Prerequisite: | lp://qastaging/~compiz-team/compiz/compiz.gtk-window-decorator-gsettings.cleanup-1 | ||||
| Diff against target: |
629 lines (+395/-41) 16 files modified
compizconfig/libcompizconfig/tests/CMakeLists.txt (+1/-1) gtk/window-decorator/CMakeLists.txt (+9/-1) gtk/window-decorator/cairo.c (+4/-2) gtk/window-decorator/decorator.c (+14/-11) gtk/window-decorator/gwd-cairo-window-decoration-util.c (+57/-0) gtk/window-decorator/gwd-cairo-window-decoration-util.h (+39/-0) gtk/window-decorator/gwd-metacity-window-decoration-util.c (+46/-0) gtk/window-decorator/gwd-metacity-window-decoration-util.h (+40/-0) gtk/window-decorator/gwd-settings-notified.c (+7/-16) gtk/window-decorator/gwd-settings.c (+3/-3) gtk/window-decorator/tests/CMakeLists.txt (+30/-0) gtk/window-decorator/tests/test_gwd_cairo_decorations.cpp (+52/-0) gtk/window-decorator/tests/test_gwd_metacity_decorations.cpp (+82/-0) gtk/window-decorator/tests/test_gwd_settings.cpp (+6/-6) include/decoration.h (+4/-0) libdecoration/decoration.c (+1/-1) |
||||
| To merge this branch: | bzr merge lp://qastaging/~compiz-team/compiz/compiz.gtk-window-decorator.fix-metacity-cairo | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| jenkins (community) | continuous-integration | Approve | |
| Daniel van Vugt | Needs Fixing | ||
|
Review via email:
|
|||
This proposal has been superseded by a proposal from 2012-09-06.
Commit message
Fixes the following issues found in (LP: #1042323)
1) BUILD_METACITY=OFF fails to build
2) X Error when using cairo mode
3) Failing to switch from metacity mode to cairo mode
4) Failing to correctly update borders when switching.
This branch fixes all of those and adds relevant testcases for those fixes.
Description of the change
This branch fixes some issues that were picked up in bug #1042323
1) BUILD_METACITY=OFF not working
2) Various runtime errors using the cairo mode
This branch fixes the build issue and ensures that we switch back to cairo mode when the metacity theme is invalid. It also fixes a segfault when getting the shadow info in cairo mode and fixes weird looking borders when switching from metacity to cairo mode dynamically.
Tests added for each case.
Fixes (LP: #1042323)
Do not merge this branch until the FFe in that bug report has been ack'd by ubuntu-release. Thanks!
| jenkins (martin-mrazik+qa) wrote | # |
| jenkins (martin-mrazik+qa) wrote | # |
| Sam Spilsbury (smspillaz) wrote | # |
| Daniel van Vugt (vanvugt) wrote | # |
| Daniel van Vugt (vanvugt) wrote | # |
| jenkins (martin-mrazik+qa) wrote | # |
PASSED: Continuous integration, rev:3420
http://
Executed test runs:
SUCCESS: http://