lp:~smspillaz/compiz-core/merge_894639

Branch merges

Propose for merging

No branches dependent on this one.

Superseded for merging into lp:compiz-core/0.9.5

Robert Carr (community): Approve on 2012-01-02

Diff: 1509 lines (+1007/-89)

23 files modified

CMakeLists.txt (+1/-0)
include/core/screen.h (+1/-0)
src/eventsource.cpp (+16/-17)
src/main.cpp (+42/-12)
src/privateeventsource.h (+15/-6)
src/privateiosource.h (+19/-10)
src/privatescreen.h (+9/-3)
src/screen.cpp (+147/-25)
src/timer/src/privatetimeoutsource.h (+4/-3)
src/timer/src/timer.cpp (+8/-7)
src/timer/tests/test-timer.cpp (+4/-4)
src/timer/tests/test-timer.h (+2/-2)
tests/CMakeLists.txt (+1/-0)
tests/integration/CMakeLists.txt (+1/-0)
tests/integration/xig/CMakeLists.txt (+32/-0)
tests/integration/xig/scripts/existing-window.conf (+27/-0)
tests/integration/xig/scripts/new-window.conf (+29/-0)
tests/integration/xig/scripts/restart.conf (+18/-0)
tests/integration/xig/scripts/startup.conf (+14/-0)
tests/integration/xig/scripts/xserver-quit.conf (+13/-0)
tests/integration/xig/src/CMakeLists.txt (+12/-0)
tests/integration/xig/src/config.h.in (+3/-0)
tests/integration/xig/src/test-runner.c (+589/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

2988. By Sam Spilsbury on 2012-01-11

Merged compiz-core.fix_899557 into compiz-core.merge_894639.

2987. By Sam Spilsbury on 2012-01-11

Merged compiz-core.fix_899557 into compiz-core.merge_894639.

2986. By Sam Spilsbury on 2012-01-11

Merged compiz-core.fix_899557 into compiz-core.merge_894639.

2985. By Sam Spilsbury on 2012-01-11

Merged compiz-core.fix_899557 into compiz-core.merge_894639.

2984. By Sam Spilsbury on 2012-01-11

Merged compiz-core.fix_899557 into compiz-core.merge_894639.

2983. By Sam Spilsbury on 2012-01-11

Don't save the mainloop pointer in the event source

2982. By Sam Spilsbury on 2012-01-11

Don't save the mainloop pointer in the event sources and explicitly destroy
all event sources before we quit the main loop since GLib will continue to poll
event sources that have not yet received any events after the main loop has
quit

2981. By Sam Spilsbury on 2012-01-11

Don't save the main loop pointer in the timers

2980. By Sam Spilsbury on 2012-01-10

Merged compiz-core.fix_899557 into compiz-core.merge_894639.

2979. By Sam Spilsbury on 2012-01-09

Merged compiz-core.fix_899557 into compiz-core.merge_894639.