lp://qastaging/~compiz-team/compiz/compiz.fix_1050796

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://qastaging/compiz/0.9.8 at revision 3393

Daniel van Vugt: Approve on 2012-09-26

jenkins (community): Needs Fixing (continuous-integration) on 2012-09-25

Diff: 991 lines (+463/-160)

12 files modified

compizconfig/integration/gnome/gsettings/include/ccs_gnome_integration_gsettings_integrated_setting.h (+11/-0)
compizconfig/integration/gnome/gsettings/include/ccs_gnome_integration_gsettings_integrated_setting_factory.h (+11/-0)
compizconfig/integration/gnome/gsettings/org.compiz.integrated.gschema.xml (+0/-21)
compizconfig/integration/gnome/gsettings/src/ccs_gnome_integration_gsettings_integrated_setting.c (+26/-2)
compizconfig/integration/gnome/gsettings/src/ccs_gnome_integration_gsettings_integrated_setting_factory.c (+37/-1)
compizconfig/integration/gnome/include/ccs_gnome_integration_constants.h (+2/-0)
compizconfig/integration/gnome/src/ccs_gnome_integration.c (+97/-30)
compizconfig/integration/gnome/src/ccs_gnome_integration_constants.c (+13/-9)
compizconfig/integration/gnome/tests/compizconfig_ccs_mock_gnome_integrated_setting_composition.c (+0/-2)
compizconfig/integration/gnome/tests/compizconfig_test_ccs_gnome_integration.cpp (+194/-48)
compizconfig/libcompizconfig/include/ccs.h (+6/-0)
compizconfig/libcompizconfig/src/main.c (+66/-47)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1050796: Double shortcuts conflict with gnome-control-center ones

High

Fix Released

Link a bug report

Related blueprints

3391. By Sam Spilsbury on 2012-09-25

Merge lp:~compiz-team/compiz/compiz.fix_1042041

3390. By Sam Spilsbury on 2012-09-25

Merge compiz.fix_1042041

3389. By Sam Spilsbury on 2012-09-25

Actually set the new value

3388. By Sam Spilsbury on 2012-09-25

Fix valgrind warnings in the test code and add test cases

3387. By Sam Spilsbury on 2012-09-25

Merge lp:~compiz-team/compiz/compiz.fix_1042041

3386. By Sam Spilsbury on 2012-09-25

Remove keys from org.compiz.integrated that were actually integratable
elsewhere and special case the run_command_* keys because they don't follow
the tradition of using 'as' instead of 's'

3385. By Sam Spilsbury on 2012-09-24

Fix build on python 2.6. Use the old method of detecting the version.
(LP: #1048964). Fixes: https://bugs.launchpad.net/bugs/1048964. Approved by Daniel van Vugt, jenkins.

3384. By Daniel van Vugt on 2012-09-21

Don't accidentally unredirect a maximized window that's not a fullscreen
window. This could happen when other windows (docks) perfectly covered the
non-maximized region, like the Unity launcher and panel do.
(LP: #1053902)
. Fixes: https://bugs.launchpad.net/bugs/1053902. Approved by Sam Spilsbury, jenkins.

3383. By Daniel van Vugt on 2012-09-21

Ensure unredirected windows get redirected if windows are being transformed,
like in scale mode.
(LP: #1047168)
. Fixes: https://bugs.launchpad.net/bugs/1047168. Approved by Sam Spilsbury.

3382. By Sam Spilsbury on 2012-09-20

This adds a system testing framework based on Xorg-GTest (launchpad.net/xorg-gtest). It will find an existing installation of xorg-gtest and compile it locally (similar to Google Test) and provides a class XorgSystemTest in the namespace compiz::testing, which will spawn compiz inside of a dummy X Sever. You can then test by interacting with the server and querying its state.

XEventMatcher is a very basic concept for matching X events as they come in. Right now, the events have to be matched in order, but its feasible that in future we could have out of order matching like we do in Google Mock. Some utility functions added on top of xorg-gtest were WaitForEventOfTypeOnWindow, which works just like the former function by checks if it matches a window or satisfies some arbitrary criteria in the case of WaitForEventOfTypeOnWindowMatching.. Fixes: . Approved by Daniel van Vugt, jenkins.