Merge lp://staging/~compiz-team/compiz-core/oneiric.uwd_fixes into lp://staging/compiz-core/oneiric
Proposed by
Sam Spilsbury
Status: | Merged |
---|---|
Approved by: | Jason Smith |
Approved revision: | 2798 |
Merged at revision: | 2784 |
Proposed branch: | lp://staging/~compiz-team/compiz-core/oneiric.uwd_fixes |
Merge into: | lp://staging/compiz-core/oneiric |
Diff against target: |
4244 lines (+1202/-1299) 30 files modified
gtk/CMakeLists.txt (+0/-5) gtk/config.h.gtk.in (+0/-25) gtk/window-decorator/CMakeLists.txt (+3/-156) gtk/window-decorator/config.h.gtk.in (+0/-25) gtk/window-decorator/decoration-test.c (+0/-537) gtk/window-decorator/decoration-test.h (+8/-5) gtk/window-decorator/decoration_inspector/CMakeLists.txt (+3/-1) gtk/window-decorator/decoration_inspector/decoration_inspector.c (+17/-19) gtk/window-decorator/simple_decorator/CMakeLists.txt (+3/-1) gtk/window-decorator/simple_decorator/simple-decorator.c (+4/-0) gtk/window-decorator/src/CMakeLists.txt (+155/-0) gtk/window-decorator/src/cairo.c (+7/-6) gtk/window-decorator/src/config.h.gtk.in (+25/-0) gtk/window-decorator/src/decorator.c (+6/-46) gtk/window-decorator/src/events.c (+187/-106) gtk/window-decorator/src/frames.c (+2/-0) gtk/window-decorator/src/gtk-window-decorator.c (+21/-17) gtk/window-decorator/src/gtk-window-decorator.h (+27/-14) gtk/window-decorator/src/metacity.c (+209/-90) gtk/window-decorator/src/settings.c (+0/-2) gtk/window-decorator/src/switcher.c (+1/-1) gtk/window-decorator/src/util.c (+10/-0) gtk/window-decorator/src/wnck.c (+120/-97) gtk/window-decorator/test-cache.c (+0/-116) gtk/window-decorator/test-cache/CMakeLists.txt (+9/-0) gtk/window-decorator/test-cache/test-cache.c (+116/-0) include/decoration.h (+66/-2) libdecoration/decoration.c (+32/-1) plugins/decor/src/decor.cpp (+168/-27) plugins/decor/src/decor.h (+3/-0) |
To merge this branch: | bzr merge lp://staging/~compiz-team/compiz-core/oneiric.uwd_fixes |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Jason Smith (community) | Approve | ||
Review via email: mp+71750@code.staging.launchpad.net |
This proposal supersedes a proposal from 2011-08-16.
This proposal has been superseded by a proposal from 2011-08-19.
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.
+1, have tested and read code, nothing stuck out