Merge lp://staging/~compiz-team/compiz-core/oneiric.uwd_fixes into lp://staging/compiz-core/0.9.5
Proposed by
David Barth
| Status: | Superseded |
|---|---|
| Proposed branch: | lp://staging/~compiz-team/compiz-core/oneiric.uwd_fixes |
| Merge into: | lp://staging/compiz-core/0.9.5 |
| Diff against target: |
16826 lines (+8659/-3638) (has conflicts) 72 files modified
CMakeLists.txt (+2/-2) cmake/CompizGSettings.cmake (+70/-0) cmake/CompizPlugin.cmake (+1/-1) cmake/plugin_extensions/CompizGenGSettings.cmake (+98/-0) gtk/CMakeLists.txt (+35/-77) gtk/gnome/CMakeLists.txt (+16/-1) gtk/gnome/compiz.desktop.in (+1/-1) gtk/window-decorator/CMakeLists.txt (+210/-79) gtk/window-decorator/actionmenu.c (+9/-13) gtk/window-decorator/blurprops.c (+3/-3) gtk/window-decorator/cairo.c (+158/-150) gtk/window-decorator/config.h.gtk.in (+25/-0) gtk/window-decorator/decoration-test.c (+537/-0) gtk/window-decorator/decoration-test.h (+113/-0) gtk/window-decorator/decoration_inspector/CMakeLists.txt (+12/-0) gtk/window-decorator/decoration_inspector/decoration_inspector.c (+1007/-0) gtk/window-decorator/decoration_inspector/decoration_inspector.xml (+436/-0) gtk/window-decorator/decorator.c (+665/-731) gtk/window-decorator/decorprops.c (+66/-62) gtk/window-decorator/events.c (+403/-309) gtk/window-decorator/forcequit.c (+10/-10) gtk/window-decorator/frames.c (+104/-138) gtk/window-decorator/gdk.c (+3/-2) gtk/window-decorator/gtk-window-decorator.c (+48/-70) gtk/window-decorator/gtk-window-decorator.h (+310/-238) gtk/window-decorator/metacity.c (+601/-381) gtk/window-decorator/settings.c (+8/-4) gtk/window-decorator/simple_decorator/CMakeLists.txt (+13/-0) gtk/window-decorator/simple_decorator/simple-decorator.c (+376/-0) gtk/window-decorator/switcher.c (+88/-128) gtk/window-decorator/test-cache.c (+116/-0) gtk/window-decorator/tooltip.c (+0/-205) gtk/window-decorator/util.c (+53/-0) gtk/window-decorator/wnck.c (+580/-440) include/core/screen.h (+3/-1) include/core/window.h (+2/-0) include/decoration.h (+152/-53) kde/window-decorator-kde4/decorator.cpp (+6/-17) kde/window-decorator-kde4/decorator.h (+2/-19) kde/window-decorator-kde4/switcher.cpp (+5/-10) kde/window-decorator-kde4/utils.cpp (+2/-0) kde/window-decorator-kde4/window.cpp (+14/-110) kde/window-decorator-kde4/window.h (+1/-1) libdecoration/decoration.c (+497/-197) metadata/core.xml.in (+3/-3) plugins/bailer/CMakeLists.txt (+5/-0) plugins/bailer/bailer.xml.in (+82/-0) plugins/bailer/src/bailer.cpp (+277/-0) plugins/bailer/src/bailer.h (+86/-0) plugins/compiztoolbox/src/compiztoolbox.cpp (+8/-2) plugins/composite/include/composite/composite.h (+4/-0) plugins/cube/cube.xml.in (+7/-6) plugins/debugspew/CMakeLists.txt (+5/-0) plugins/debugspew/debugspew.xml.in (+24/-0) plugins/debugspew/src/debugspew.cpp (+637/-0) plugins/debugspew/src/debugspew.h (+55/-0) plugins/decor/decor.xml.in (+3/-2) plugins/decor/src/decor.cpp (+370/-134) plugins/decor/src/decor.h (+7/-13) plugins/detection/CMakeLists.txt (+5/-0) plugins/detection/detection.xml.in (+28/-0) plugins/detection/src/detection.cpp (+74/-0) plugins/detection/src/detection.h (+52/-0) plugins/fade/fade.xml.in (+2/-1) plugins/opengl/include/opengl/opengl.h (+4/-0) plugins/opengl/opengl.xml.in (+1/-1) plugins/place/place.xml.in (+1/-1) plugins/resize/resize.xml.in (+8/-8) plugins/scale/scale.xml.in (+8/-10) src/main.cpp (+17/-0) src/privatescreen.h (+1/-0) src/window.cpp (+24/-4) Text conflict in cmake/CompizGSettings.cmake Text conflict in cmake/plugin_extensions/CompizGenGSettings.cmake Text conflict in plugins/decor/src/decor.cpp |
| To merge this branch: | bzr merge lp://staging/~compiz-team/compiz-core/oneiric.uwd_fixes |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Compiz Maintainers | Pending | ||
|
Review via email:
|
|||
This proposal has been superseded by a proposal from 2011-08-16.
Description of the change
Various UWD fixes to get the review process started. Needs LP bug references.
To post a comment you must log in.
Unmerged revisions
- 2798. By Sam Spilsbury
-
Rearrange the build a bit to fix warnings due to gtk2/3 mixing.
CMake requires that the decorator be in a separate subdirectory because
it needs conflicting includes - 2797. By Sam Spilsbury
-
Fix warnings, remove debug messages
- 2796. By Sam Spilsbury
-
Actually generate default decorations
- 2795. By Sam Spilsbury
-
Fix some crashes when handling synthetic ButtonRelease events
when the frame window was destroyed (BadWindow) and also maybe
fix bug where sometimes frame windows wouldn't be created or reparented
in - 2794. By Sam Spilsbury
-
Fix crash on unmaximize
- 2793. By Sam Spilsbury
-
Actually handle the leave notify event correctly
- 2792. By Sam Spilsbury
-
Try to handle leave events and cleanup
- 2791. By Sam Spilsbury
-
Fixed wrong extents offsets for quads on theme changes
cleanup code a little - 2790. By Sam Spilsbury
-
Added documentation, removed debugging code
- 2789. By Andrea Cimitan
-
Added means to draw antialiased corners
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
