Compiz

Merge lp://qastaging/~compiz-team/compiz/compiz.ccs_split_gsettings_rw_funcs into lp://qastaging/compiz/0.9.8

compiz.ccs_split_gsettings_rw_funcs
Merge into 0.9.8

Proposed by Sam Spilsbury on 2012-08-07

Status:	Superseded
Proposed branch:	lp://qastaging/~compiz-team/compiz/compiz.ccs_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:	8900 lines (+4857/-2089) 43 files modified compizconfig/compizconfig-python/src/compizconfig.pyx (+1/-1) compizconfig/gconf/src/gconf.c (+11/-14) compizconfig/gsettings/gsettings_backend_shared/CMakeLists.txt (+21/-4) compizconfig/gsettings/gsettings_backend_shared/ccs_gsettings_backend.c (+439/-0) compizconfig/gsettings/gsettings_backend_shared/ccs_gsettings_backend.h (+41/-0) compizconfig/gsettings/gsettings_backend_shared/ccs_gsettings_backend_interface.c (+90/-0) compizconfig/gsettings/gsettings_backend_shared/ccs_gsettings_backend_interface.h (+128/-0) 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.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/gconf-integration.c (+196/-79) compizconfig/gsettings/gsettings_backend_shared/gconf-integration.h (+20/-0) compizconfig/gsettings/gsettings_backend_shared/gsettings_shared.h (+10/-0) compizconfig/gsettings/gsettings_backend_shared/gsettings_util.c (+765/-10) compizconfig/gsettings/gsettings_backend_shared/gsettings_util.h (+154/-4) compizconfig/gsettings/src/gsettings.c (+178/-826) compizconfig/gsettings/src/gsettings.h (+0/-72) compizconfig/gsettings/tests/CMakeLists.txt (+31/-4) compizconfig/gsettings/tests/ccs_gsettings_backend_mock.cpp (+59/-0) compizconfig/gsettings/tests/ccs_gsettings_backend_mock.h (+160/-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 (+1185/-37) compizconfig/gsettings/tests/test_gsettings_tests.h (+30/-0) compizconfig/gsettings/tests/test_gsettings_wrapper.cpp (+249/-0) compizconfig/libcompizconfig/include/ccs-backend.h (+56/-3) compizconfig/libcompizconfig/include/ccs-defs.h (+41/-0) compizconfig/libcompizconfig/include/ccs-object.h (+11/-0) compizconfig/libcompizconfig/include/ccs.h (+6/-20) compizconfig/libcompizconfig/src/main.c (+177/-48) compizconfig/libcompizconfig/tests/CMakeLists.txt (+2/-2) compizconfig/libcompizconfig/tests/compizconfig_test_ccs_mock_backend_conformance.cpp (+0/-643) compizconfig/libcompizconfig/tests/compizconfig_test_ccs_object.cpp (+1/-77) compizconfig/libcompizconfig/tests/compizconfig_test_ccs_setting.cpp (+2/-0) compizconfig/mocks/libcompizconfig/compizconfig_ccs_setting_mock.cpp (+1/-0) compizconfig/mocks/libcompizconfig/compizconfig_ccs_setting_mock.h (+12/-0) compizconfig/tests/compizconfig_ccs_mocked_allocator.h (+91/-0)
To merge this branch:	bzr merge lp://qastaging/~compiz-team/compiz/compiz.ccs_split_gsettings_rw_funcs
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Compiz Maintainers		2012-08-07	Pending
Review via email: mp+118491@code.qastaging.launchpad.net

This proposal supersedes 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: https://code.launchpad.net/~compiz-team/compiz/compiz.ccs_gsettings_additional_test_coverage/+merge/118494

lp://qastaging/~compiz-team/compiz/compiz.ccs_split_gsettings_rw_funcs updated on 2012-08-22

3503. By Sam Spilsbury on 2012-08-07: Merged compiz.ccs_gsettings_wrapper into compiz.ccs_split_gsettings_rw_funcs.
3504. By Sam Spilsbury on 2012-08-07: Merged compiz.ccs_gsettings_wrapper into compiz.ccs_split_gsettings_rw_funcs.
3505. By Sam Spilsbury on 2012-08-07: Merged compiz.ccs_gsettings_wrapper into compiz.ccs_split_gsettings_rw_funcs.
3506. By Sam Spilsbury on 2012-08-07: Merged compiz.ccs_gsettings_wrapper into compiz.ccs_split_gsettings_rw_funcs.
3507. By Sam Spilsbury on 2012-08-07: Merged compiz.ccs_gsettings_wrapper into compiz.ccs_split_gsettings_rw_funcs.
3508. By Sam Spilsbury on 2012-08-07: Merged compiz.ccs_gsettings_wrapper into compiz.ccs_split_gsettings_rw_funcs.
3509. By Sam Spilsbury on 2012-08-07: Merged compiz.ccs_gsettings_wrapper into compiz.ccs_split_gsettings_rw_funcs.
3510. By Sam Spilsbury on 2012-08-07: Merged compiz.ccs_gsettings_wrapper into compiz.ccs_split_gsettings_rw_funcs.
3511. By Sam Spilsbury on 2012-08-07: Merged compiz.ccs_gsettings_wrapper into compiz.ccs_split_gsettings_rw_funcs.
3512. By Sam Spilsbury on 2012-08-07: Merged compiz.ccs_gsettings_wrapper into compiz.ccs_split_gsettings_rw_funcs.
3513. By Sam Spilsbury on 2012-08-07: Merged compiz.ccs_gsettings_wrapper into compiz.ccs_split_gsettings_rw_funcs.
3514. By Sam Spilsbury on 2012-08-07: Moved files to where they should be
3515. By Sam Spilsbury on 2012-08-07: Rever some whitespace changes
3516. By Sam Spilsbury on 2012-08-07: Merged compiz.ccs_gsettings_wrapper into compiz.ccs_split_gsettings_rw_funcs.
3517. By Sam Spilsbury on 2012-08-07: Merged compiz.ccs_gsettings_wrapper into compiz.ccs_split_gsettings_rw_funcs.
3518. By Sam Spilsbury on 2012-08-07: Merged compiz.ccs_gsettings_wrapper into compiz.ccs_split_gsettings_rw_funcs.
3519. By Sam Spilsbury on 2012-08-07: Merge
3520. By Sam Spilsbury on 2012-08-07: Merge
3521. By Sam Spilsbury on 2012-08-07: Merged compiz.ccs_gsettings_wrapper into compiz.ccs_split_gsettings_rw_funcs.
3522. By Sam Spilsbury on 2012-08-07: Merge
3523. By Sam Spilsbury on 2012-08-07: Merged compiz.ccs_gsettings_wrapper into compiz.ccs_split_gsettings_rw_funcs.
3524. By Sam Spilsbury on 2012-08-07: Merged compiz.ccs_gsettings_wrapper into compiz.ccs_split_gsettings_rw_funcs.
3525. By Sam Spilsbury on 2012-08-09: Moved the CCSGSettingsBackend class into its own file, moved the gconf integration bits into the gsettings_backend_shared library
3526. By Sam Spilsbury on 2012-08-09: Ensure we always have a default profile
3527. By Sam Spilsbury on 2012-08-09: Merge forwards
3528. By Sam Spilsbury on 2012-08-09: Merge
3529. By Sam Spilsbury on 2012-08-09: Merge
3530. By Sam Spilsbury on 2012-08-10: Merged compiz.ccs_gsettings_backend_interface into compiz.ccs_split_gsettings_rw_funcs.
3531. By Sam Spilsbury on 2012-08-10: Merged compiz.ccs_gsettings_backend_interface into compiz.ccs_split_gsettings_rw_funcs.
3532. By Sam Spilsbury on 2012-08-10: Merge
3533. By Sam Spilsbury on 2012-08-11: Merge
3534. By Sam Spilsbury on 2012-08-11: Merge
3535. By Sam Spilsbury on 2012-08-11: Merge
3536. By Sam Spilsbury on 2012-08-11: Merged compiz.ccs_gsettings_backend_interface into compiz.ccs_split_gsettings_rw_funcs.
3537. By Sam Spilsbury on 2012-08-11: Merged compiz.ccs_gsettings_backend_interface into compiz.ccs_split_gsettings_rw_funcs.
3538. By Sam Spilsbury on 2012-08-11: const
3539. By Sam Spilsbury on 2012-08-11: Reverted some of the more useless things
3540. By Sam Spilsbury on 2012-08-11: Merged compiz.ccs_gsettings_backend_interface into compiz.ccs_split_gsettings_rw_funcs.
3541. By Sam Spilsbury on 2012-08-11: Merged compiz.ccs_gsettings_backend_interface into compiz.ccs_split_gsettings_rw_funcs.
3542. By Sam Spilsbury on 2012-08-11: Merged compiz.ccs_gsettings_backend_interface into compiz.ccs_split_gsettings_rw_funcs.
3543. By Sam Spilsbury on 2012-08-11: Merged compiz.ccs_gsettings_backend_interface into compiz.ccs_split_gsettings_rw_funcs.
3544. By Sam Spilsbury on 2012-08-11: Resolve path conflicts part 3: moved files pending deletion out the way
3545. By Sam Spilsbury on 2012-08-11: Merged compiz.ccs_gsettings_backend_interface into compiz.ccs_split_gsettings_rw_funcs.
3546. By Sam Spilsbury on 2012-08-11: Merged compiz.ccs_gsettings_backend_interface into compiz.ccs_split_gsettings_rw_funcs.
3547. By Sam Spilsbury on 2012-08-11: Merged compiz.ccs_gsettings_backend_interface into compiz.ccs_split_gsettings_rw_funcs.
3548. By Sam Spilsbury on 2012-08-11: Merged compiz.ccs_gsettings_backend_interface into compiz.ccs_split_gsettings_rw_funcs.
3549. By Sam Spilsbury on 2012-08-11: Update the files as appropriate
3550. By Sam Spilsbury on 2012-08-11: Remove the old files
3551. By Sam Spilsbury on 2012-08-11: Removed file that shouldn't be there
3552. By Sam Spilsbury on 2012-08-11: Merge
3553. By Sam Spilsbury on 2012-08-11: Merge
3554. By Sam Spilsbury on 2012-08-11: Merge
3555. By Sam Spilsbury on 2012-08-11: Merged compiz.ccs_gsettings_backend_interface into compiz.ccs_split_gsettings_rw_funcs.
3556. By Sam Spilsbury on 2012-08-11: Merged compiz.ccs_gsettings_backend_interface into compiz.ccs_split_gsettings_rw_funcs.
3557. By Sam Spilsbury on 2012-08-11: Merged compiz.ccs_gsettings_backend_interface into compiz.ccs_split_gsettings_rw_funcs.
3558. By Sam Spilsbury on 2012-08-11: Move the old stuff out the way
3559. By Sam Spilsbury on 2012-08-11: Merged compiz.ccs_gsettings_backend_interface into compiz.ccs_split_gsettings_rw_funcs.
3560. By Sam Spilsbury on 2012-08-11: Merge in the old changes
3561. By Sam Spilsbury on 2012-08-11: Remove old files
3562. By Sam Spilsbury on 2012-08-11: Merged compiz.ccs_gsettings_backend_interface into compiz.ccs_split_gsettings_rw_funcs.
3563. By Sam Spilsbury on 2012-08-11: Merge
3564. By Sam Spilsbury on 2012-08-11: Moved the old one out the way
3565. By Sam Spilsbury on 2012-08-11: Merged compiz.ccs_gsettings_backend_interface into compiz.ccs_split_gsettings_rw_funcs.
3566. By Sam Spilsbury on 2012-08-11: Merge
3567. By Sam Spilsbury on 2012-08-11: Remove old file
3568. By Sam Spilsbury on 2012-08-11: Merged compiz.ccs_gsettings_backend_interface into compiz.ccs_split_gsettings_rw_funcs.
3569. By Sam Spilsbury on 2012-08-11: Merged compiz.ccs_gsettings_backend_interface into compiz.ccs_split_gsettings_rw_funcs.
3570. By Sam Spilsbury on 2012-08-11: Merged compiz.ccs_gsettings_backend_interface into compiz.ccs_split_gsettings_rw_funcs.
3571. By Sam Spilsbury on 2012-08-11: Merged compiz.ccs_gsettings_backend_interface into compiz.ccs_split_gsettings_rw_funcs.
3572. By Sam Spilsbury on 2012-08-11: Merged compiz.ccs_gsettings_backend_interface into compiz.ccs_split_gsettings_rw_funcs.
3573. By Sam Spilsbury on 2012-08-11: Merged compiz.ccs_gsettings_backend_interface into compiz.ccs_split_gsettings_rw_funcs.
3574. By Sam Spilsbury on 2012-08-11: Merged compiz.ccs_gsettings_backend_interface into compiz.ccs_split_gsettings_rw_funcs.
3575. By Sam Spilsbury on 2012-08-11: Merged compiz.ccs_gsettings_backend_interface into compiz.ccs_split_gsettings_rw_funcs.
3576. By Sam Spilsbury on 2012-08-11: Merged compiz.ccs_gsettings_backend_interface into compiz.ccs_split_gsettings_rw_funcs.
3577. By Sam Spilsbury on 2012-08-11: Merged compiz.ccs_gsettings_backend_interface into compiz.ccs_split_gsettings_rw_funcs.
3578. By Sam Spilsbury on 2012-08-11: Remove duplicate include
3579. By Sam Spilsbury on 2012-08-11: Merged compiz.ccs_gsettings_backend_interface into compiz.ccs_split_gsettings_rw_funcs.
3580. By Sam Spilsbury on 2012-08-11: Merged compiz.ccs_gsettings_backend_interface into compiz.ccs_split_gsettings_rw_funcs.
3581. By Sam Spilsbury on 2012-08-11: Added missing functions
3582. By Sam Spilsbury on 2012-08-11: Do profile update on GetExistingProfiles
3583. By Sam Spilsbury on 2012-08-12: Merged compiz.ccs_gsettings_backend_interface into compiz.ccs_split_gsettings_rw_funcs.
3584. By Sam Spilsbury on 2012-08-12: Merged compiz.ccs_gsettings_backend_interface into compiz.ccs_split_gsettings_rw_funcs.
3585. By Sam Spilsbury on 2012-08-12: Merged compiz.ccs_gsettings_backend_interface into compiz.ccs_split_gsettings_rw_funcs.
3586. By Sam Spilsbury on 2012-08-15: Merge
3587. By Sam Spilsbury on 2012-08-15: Don't re-add default backend
3588. By Sam Spilsbury on 2012-08-15: Merged compiz.ccs_gsettings_backend_interface into compiz.ccs_split_gsettings_rw_funcs.
3589. By Sam Spilsbury on 2012-08-15: Merged compiz.ccs_gsettings_backend_interface into compiz.ccs_split_gsettings_rw_funcs.
3590. By Sam Spilsbury on 2012-08-16: Merged compiz.ccs_gsettings_backend_interface into compiz.ccs_split_gsettings_rw_funcs.
3591. By Sam Spilsbury on 2012-08-16: Merged compiz.ccs_gsettings_backend_interface into compiz.ccs_split_gsettings_rw_funcs.
3592. By Sam Spilsbury on 2012-08-16: Merged compiz.ccs_gsettings_backend_interface into compiz.ccs_split_gsettings_rw_funcs.
3593. By Sam Spilsbury on 2012-08-16: Use c++0x
3594. By Sam Spilsbury on 2012-08-16: Merged compiz.ccs_gsettings_backend_interface into compiz.ccs_split_gsettings_rw_funcs.
3595. By Sam Spilsbury on 2012-08-16: Merged compiz.ccs_gsettings_backend_interface into compiz.ccs_split_gsettings_rw_funcs.
3596. By Sam Spilsbury on 2012-08-17: Merged compiz.ccs_gsettings_backend_interface into compiz.ccs_split_gsettings_rw_funcs.
3597. By Sam Spilsbury on 2012-08-17: Merged compiz.ccs_gsettings_backend_interface into compiz.ccs_split_gsettings_rw_funcs.
3598. By Sam Spilsbury on 2012-08-17: Merged compiz.ccs_gsettings_backend_interface into compiz.ccs_split_gsettings_rw_funcs.
3599. By Sam Spilsbury on 2012-08-17: Merged compiz.ccs_gsettings_backend_interface into compiz.ccs_split_gsettings_rw_funcs.
3600. By Sam Spilsbury on 2012-08-17: Merged compiz.ccs_gsettings_backend_interface into compiz.ccs_split_gsettings_rw_funcs.
3601. By Sam Spilsbury on 2012-08-17: Merged compiz.ccs_gsettings_backend_interface into compiz.ccs_split_gsettings_rw_funcs.
3602. By Sam Spilsbury on 2012-08-17: Merged compiz.ccs_gsettings_backend_interface into compiz.ccs_split_gsettings_rw_funcs.
3603. By Sam Spilsbury on 2012-08-22: Merged compiz.ccs_gsettings_backend_interface into compiz.ccs_split_gsettings_rw_funcs.
3604. By Sam Spilsbury on 2012-08-22: Merged compiz.ccs_gsettings_backend_interface into compiz.ccs_split_gsettings_rw_funcs.