lp:~compiz-team/compiz/compiz.fix_1002602_tests

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:compiz/0.9.8 at revision 3244

Daniel van Vugt: Approve on 2012-06-06

Compiz Maintainers: Pending requested 2012-06-02

Diff: 1659 lines (+1196/-85)

26 files modified

include/core/abiversion.h (+1/-1)
include/core/screen.h (+3/-0)
plugins/CMakeLists.txt (+1/-0)
plugins/composite/CMakeLists.txt (+6/-2)
plugins/composite/include/composite/composite.h (+1/-4)
plugins/composite/src/pixmapbinding/CMakeLists.txt (+43/-0)
plugins/composite/src/pixmapbinding/include/pixmapbinding.h (+191/-0)
plugins/composite/src/pixmapbinding/src/pixmapbinding.cpp (+141/-0)
plugins/composite/src/pixmapbinding/tests/CMakeLists.txt (+24/-0)
plugins/composite/src/pixmapbinding/tests/test-composite-pixmapbinding.cpp (+444/-0)
plugins/composite/src/privates.h (+21/-6)
plugins/composite/src/screen.cpp (+2/-0)
plugins/composite/src/window.cpp (+68/-72)
plugins/opengl/src/window.cpp (+2/-0)
src/CMakeLists.txt (+5/-0)
src/event.cpp (+25/-0)
src/plugin.cpp (+2/-0)
src/plugin/CMakeLists.txt (+1/-0)
src/privatescreen.h (+8/-0)
src/privatescreen/tests/CMakeLists.txt (+1/-0)
src/privatescreen/tests/test-privatescreen.cpp (+5/-0)
src/servergrab/CMakeLists.txt (+42/-0)
src/servergrab/include/core/servergrab.h (+51/-0)
src/servergrab/src/servergrab.cpp (+39/-0)
src/servergrab/tests/CMakeLists.txt (+14/-0)
src/servergrab/tests/test-servergrab.cpp (+55/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

3238. By Daniel van Vugt on 2012-06-05

Remove a pointless line of code that was also causing a minor conflict.

3237. By Sam Spilsbury on 2012-06-01

Fix copyright and s/PixmapBinder/PixmapBinding/

3236. By Sam Spilsbury on 2012-05-31

Renamed the file too

3235. By Sam Spilsbury on 2012-05-31

Rename PixmapRebinder to PixmapBinding

3234. By Sam Spilsbury on 2012-05-28

Added missing files

3233. By Sam Spilsbury on 2012-05-26

Compile size.cpp directly ... don't copy and paste

3232. By Sam Spilsbury on 2012-05-26

Added remaining tests for pixmap binder

3231. By Sam Spilsbury on 2012-05-26

Initial test for PixmapBinder ... move to separate static lib

3230. By Sam Spilsbury on 2012-05-26

Move ServerGrab into CompScreen

3229. By Sam Spilsbury on 2012-05-26

Move PixmapRebinder into a separate file