Merge lp://qastaging/~compiz-team/compiz/compiz.split_gsettings_rw_funcs into lp://qastaging/compiz/0.9.8
Proposed by
Sam Spilsbury
| Status: | Superseded |
|---|---|
| Proposed branch: | lp://qastaging/~compiz-team/compiz/compiz.split_gsettings_rw_funcs |
| Merge into: | lp://qastaging/compiz/0.9.8 |
| Prerequisite: | lp://qastaging/~compiz-team/compiz/compiz.ccs_backend_conformance_test |
| Diff against target: |
6281 lines (+4126/-1139) 31 files modified
compizconfig/gconf/src/gconf.c (+2/-2) compizconfig/gsettings/gsettings_backend_shared/CMakeLists.txt (+15/-1) compizconfig/gsettings/gsettings_backend_shared/ccs_gsettings_interface.c (+65/-0) compizconfig/gsettings/gsettings_backend_shared/ccs_gsettings_interface.h (+59/-0) compizconfig/gsettings/gsettings_backend_shared/ccs_gsettings_interface_wrapper.c (+260/-0) compizconfig/gsettings/gsettings_backend_shared/ccs_gsettings_interface_wrapper.h (+21/-0) compizconfig/gsettings/gsettings_backend_shared/gsettings_util.c (+935/-10) compizconfig/gsettings/gsettings_backend_shared/gsettings_util.h (+242/-4) compizconfig/gsettings/src/gconf-integration.c (+55/-42) compizconfig/gsettings/src/gsettings.c (+336/-666) compizconfig/gsettings/src/gsettings.h (+31/-12) compizconfig/gsettings/tests/CMakeLists.txt (+29/-2) compizconfig/gsettings/tests/ccs_gsettings_backend_mock.cpp (+61/-0) compizconfig/gsettings/tests/ccs_gsettings_backend_mock.h (+176/-0) compizconfig/gsettings/tests/ccs_gsettings_wrapper_mock.cpp (+52/-0) compizconfig/gsettings/tests/ccs_gsettings_wrapper_mock.h (+113/-0) compizconfig/gsettings/tests/gsettings-mock-schemas-config.h.in (+7/-0) compizconfig/gsettings/tests/gsettings_mocks.cpp (+0/-200) compizconfig/gsettings/tests/gsettings_mocks.h (+0/-45) compizconfig/gsettings/tests/org.compiz.mock.gschema.xml (+53/-0) compizconfig/gsettings/tests/test_gsettings_tests.cpp (+1195/-45) compizconfig/gsettings/tests/test_gsettings_tests.h (+43/-2) compizconfig/gsettings/tests/test_gsettings_wrapper.cpp (+249/-0) compizconfig/libcompizconfig/include/ccs-defs.h (+18/-0) compizconfig/libcompizconfig/include/ccs-object.h (+11/-0) compizconfig/libcompizconfig/include/ccs.h (+0/-19) compizconfig/libcompizconfig/src/main.c (+0/-11) compizconfig/libcompizconfig/tests/CMakeLists.txt (+1/-1) compizconfig/libcompizconfig/tests/compizconfig_test_ccs_object.cpp (+1/-77) compizconfig/mocks/libcompizconfig/compizconfig_ccs_setting_mock.h (+5/-0) compizconfig/tests/compizconfig_ccs_mocked_allocator.h (+91/-0) |
| To merge this branch: | bzr merge lp://qastaging/~compiz-team/compiz/compiz.split_gsettings_rw_funcs |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Compiz Maintainers | Pending | ||
|
Review via email:
|
|||
This proposal supersedes a proposal from 2012-07-12.
This proposal has been superseded by a proposal from 2012-08-07.
Description of the change
Split out the read and write functions to and from variants so that we can re-use them in the tests
Next: lp:~compiz-team/compiz/compiz.gsettings_conformance_test
To post a comment you must log in.
Unmerged revisions
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
