Merge lp:~compiz-team/compiz/compiz.gsettings_conformance_test into lp:compiz/0.9.8

[Sam Spilsbury]

Instantiate the GSettings backend in a test harness and run the conformance tests on it.

This is not actually needing review, I've just got it marked as Needs Review so that the CI bot will run tests on it.

[lp:~compiz-team/compiz/compiz.gsettings_conformance_test]

3338. By Sam Spilsbury on 2012-07-14

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3339. By Sam Spilsbury on 2012-07-14

Merge

3340. By Sam Spilsbury on 2012-07-14

Correclty overload functions, remove other merge markers

3341. By Sam Spilsbury on 2012-07-14

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3342. By Sam Spilsbury on 2012-07-14

Attach to the correct test fixture

3343. By Sam Spilsbury on 2012-07-14

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3344. By Sam Spilsbury on 2012-07-14

Set appropriate expectaitons for gsettings backend conformance

3345. By Sam Spilsbury on 2012-07-14

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3346. By Sam Spilsbury on 2012-07-14

Make the tests not crash

3347. By Sam Spilsbury on 2012-07-14

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3348. By Sam Spilsbury on 2012-07-14

Make the write tests pass with a little less noise

3349. By Sam Spilsbury on 2012-07-15

Add integer expectations

3350. By Sam Spilsbury on 2012-07-15

Change mock settings so that they are always different from the
settings we change the values to in the tests

3351. By Sam Spilsbury on 2012-07-16

Provide CCSBackend to callers of translateKeyForGSettings so that we
can get the backend when we are going to register the callback

3352. By Sam Spilsbury on 2012-07-16

Hide signal connection behind interface

3353. By Sam Spilsbury on 2012-07-16

Neutralize the signal connection

3354. By Sam Spilsbury on 2012-07-16

Reduce the amount of noise when calling the write functions

3355. By Sam Spilsbury on 2012-07-16

Added float writing and reading funcs

3356. By Sam Spilsbury on 2012-07-16

Fill in the other read and write constructs, only some of the tests pass

3357. By Sam Spilsbury on 2012-07-16

Fix Bool/gboolean difference for read and write expecations

3358. By Sam Spilsbury on 2012-07-16

Fix string and match write tests, match is still being wonky...

3359. By Sam Spilsbury on 2012-07-17

Use the same GSettings object in the tests and in the backend and also
fix the color tests failing because of the lossy string conversion (simulate
this behaviour in the tests too and add a note saying that we expect it).

3360. By Sam Spilsbury on 2012-07-18

Fix key and button tests + printers

3361. By Sam Spilsbury on 2012-07-18

Fix missing break causing a test to fail

3362. By Sam Spilsbury on 2012-07-18

Fix broken ReadBellAtKey

3363. By Sam Spilsbury on 2012-07-18

Fix failing mock color test, we should simulate the toString behaviour
there too

3364. By Sam Spilsbury on 2012-07-18

Whitespace

3365. By Sam Spilsbury on 2012-07-19

We need to copy the lists and instantiate the lists a bit later
so that we don't get segfault due to a double free

3366. By Sam Spilsbury on 2012-07-19

Fix uninitialized read

3367. By Sam Spilsbury on 2012-07-19

Remove useless comment

3368. By Sam Spilsbury on 2012-07-20

Keep the setting object around for every instance of the value object.

3369. By Sam Spilsbury on 2012-07-20

Fix some spurious gmock warnings

3370. By Sam Spilsbury on 2012-07-20

Fix typo in test annotation

3371. By Sam Spilsbury on 2012-07-20

Fix unsafe array code fixing test CCSGSettingsBackendConcept/CCSBackendConformanceTestReadWrite

3372. By Sam Spilsbury on 2012-07-20

Fix bool comparison in ccsCompareLists when using multiple definitions
of TRUE and FALSE (it happens ...)

3373. By Sam Spilsbury on 2012-07-20

Added some notes as to remaining work

3374. By Sam Spilsbury on 2012-07-20

Store the initial color value list as lossy

3375. By Sam Spilsbury on 2012-07-20

Just calloc the array instead of memsetting every element and fix
color read in lists only reading into the first color

3376. By Sam Spilsbury on 2012-07-20

Remove lossy emulation, its no longer necessary now that we store
the initial values in a lossy format

3377. By Sam Spilsbury on 2012-07-21

Remove redundant comment

3378. By Sam Spilsbury on 2012-07-21

Provide the setting list type in ReadListAtKey. Make the list read tests pass

3379. By Sam Spilsbury on 2012-07-21

Fix typo in CCSGSettingsTestIndependent.TestReadVariantIsValidTypeGood

3380. By Sam Spilsbury on 2012-07-21

Ensure that variants are written to keys, now GSETTINGS_BACKEND=memory
works correctly

3381. By Sam Spilsbury on 2012-07-21

Added an updateSetting method to the backend interface, not actually used
anywhere yet

3382. By Sam Spilsbury on 2012-07-21

Added stub updateSetting definitions to the backend

3383. By Sam Spilsbury on 2012-07-21

Ini backend doesn't really have a concept of updating single settings,
but add a sensible definition in case someone wants to do it anyways

3384. By Sam Spilsbury on 2012-07-21

Added a sensible definition of updateSetting

3385. By Sam Spilsbury on 2012-07-21

Added a sensible definition of updateSetting for gsettings

3386. By Sam Spilsbury on 2012-07-21

Added test TestUpdateMockedValue

3387. By Sam Spilsbury on 2012-07-21

Added PostUpdate and PreUpdate hooks into the test fixture so now
MockCCSBackendConcept/CCSBackendConformanceTestReadWrite.TestUpdateMockedValue/*
will pass

3388. By Sam Spilsbury on 2012-07-21

Store path as a const char

3389. By Sam Spilsbury on 2012-07-21

Refactor out findSettingAndPluginToUpdateFromPath

3390. By Sam Spilsbury on 2012-07-21

Move it to gsettings_util

3391. By Sam Spilsbury on 2012-07-21

Refactor updateSettingWithGSettingsKeyName

3392. By Sam Spilsbury on 2012-07-21

Move updateSettingWithGSettingsKeyName into the util library

3393. By Sam Spilsbury on 2012-07-21

Added TestUpdateKeyedValue - all failing

3394. By Sam Spilsbury on 2012-07-21

Make the mock UpdateSettingAtKey tests pass

3395. By Sam Spilsbury on 2012-07-21

Make TestUpdateKeyedValu* pass on GSettings

3396. By Sam Spilsbury on 2012-07-21

Remove useless comment and unset evn

3397. By Sam Spilsbury on 2012-07-22

Always assume that lists are copied - fix list leak (and use smart
pointers more effectively)

3398. By Sam Spilsbury on 2012-07-22

Fix leaked path in CCSGSettingsBackendEnv::SetUp

3399. By Sam Spilsbury on 2012-07-22

Fix memory leak in readListValue in gsettings.c - we must always
provide a valid CCSSetting object otherwise ccsFreeSettingValue will not
actually free the setting value

3400. By Sam Spilsbury on 2012-07-22

Fix various memory leaks due to not unreffing some variants

3401. By Sam Spilsbury on 2012-07-22

Added debugging message

3402. By Sam Spilsbury on 2012-07-22

Put the expectation in the right place

3403. By Sam Spilsbury on 2012-07-22

Indirect the gconf client registration

3404. By Sam Spilsbury on 2012-07-22

Neuter gconf client connection

3405. By Sam Spilsbury on 2012-07-22

Lazy-register the gconf client

3406. By Sam Spilsbury on 2012-07-23

file (INSTALL ...) will respect DESTDIR by default, so no need to include
it again.

3407. By Sam Spilsbury on 2012-07-23

Fix some crashes in debian chroots

3408. By Sam Spilsbury on 2012-07-23

Make the profile general for tests

3409. By Sam Spilsbury on 2012-07-23

Added testing config backend

3410. By Sam Spilsbury on 2012-07-23

Merge lp:compiz

3411. By Sam Spilsbury on 2012-07-24

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3412. By Sam Spilsbury on 2012-07-24

Merge

3413. By Sam Spilsbury on 2012-07-24

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3414. By Sam Spilsbury on 2012-07-24

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3415. By Sam Spilsbury on 2012-07-24

Merge

3416. By Sam Spilsbury on 2012-07-24

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3417. By Sam Spilsbury on 2012-07-24

Merge

3418. By Sam Spilsbury on 2012-07-24

Added a quick TODO about the usage of sys.path

3419. By Sam Spilsbury on 2012-07-24

Just override sys.path[0] for now, need to prepend

3420. By Sam Spilsbury on 2012-07-24

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3421. By Sam Spilsbury on 2012-07-24

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3422. By Sam Spilsbury on 2012-07-24

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3423. By Sam Spilsbury on 2012-07-24

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3424. By Sam Spilsbury on 2012-07-24

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3425. By Sam Spilsbury on 2012-07-24

Merge

3426. By Sam Spilsbury on 2012-07-24

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3427. By Sam Spilsbury on 2012-07-25

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3428. By Sam Spilsbury on 2012-07-25

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3429. By Sam Spilsbury on 2012-07-25

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3430. By Sam Spilsbury on 2012-07-25

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3431. By Sam Spilsbury on 2012-07-26

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3432. By Sam Spilsbury on 2012-07-26

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3433. By Sam Spilsbury on 2012-07-26

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3434. By Sam Spilsbury on 2012-07-26

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3435. By Sam Spilsbury on 2012-07-26

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3436. By Sam Spilsbury on 2012-07-26

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3437. By Sam Spilsbury on 2012-07-26

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3438. By Sam Spilsbury on 2012-07-26

Merge from previous. All the GSettings backend tests fail but that's fine

3439. By Sam Spilsbury on 2012-07-26

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3440. By Sam Spilsbury on 2012-07-26

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3441. By Sam Spilsbury on 2012-07-26

Fix crashing GSettings tests

3442. By Sam Spilsbury on 2012-07-26

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3443. By Sam Spilsbury on 2012-07-26

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3444. By Sam Spilsbury on 2012-07-26

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3445. By Sam Spilsbury on 2012-07-26

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3446. By Sam Spilsbury on 2012-07-26

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3447. By Sam Spilsbury on 2012-07-26

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3448. By Sam Spilsbury on 2012-07-26

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3449. By Sam Spilsbury on 2012-07-26

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3450. By Sam Spilsbury on 2012-07-26

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3451. By Sam Spilsbury on 2012-07-26

Merge

3452. By Sam Spilsbury on 2012-07-26

Nuke unused function in header file

3453. By Sam Spilsbury on 2012-07-26

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3454. By Sam Spilsbury on 2012-07-26

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3455. By Sam Spilsbury on 2012-07-26

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3456. By Sam Spilsbury on 2012-07-26

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3457. By Sam Spilsbury on 2012-07-27

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3458. By Sam Spilsbury on 2012-07-27

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3459. By Sam Spilsbury on 2012-07-27

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3460. By Sam Spilsbury on 2012-07-27

Merge

3461. By Sam Spilsbury on 2012-07-27

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3462. By Sam Spilsbury on 2012-07-28

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3463. By Sam Spilsbury on 2012-07-29

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3464. By Sam Spilsbury on 2012-07-29

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3465. By Sam Spilsbury on 2012-07-30

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3466. By Sam Spilsbury on 2012-07-30

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3467. By Sam Spilsbury on 2012-07-31

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3468. By Sam Spilsbury on 2012-07-31

Moved CharacterWrapper definition into tests/shared/gtest_shared_characterwrapper.h

3469. By Sam Spilsbury on 2012-07-31

Merge

3470. By Sam Spilsbury on 2012-07-31

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3471. By Sam Spilsbury on 2012-07-31

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3472. By Sam Spilsbury on 2012-08-01

Merge

3473. By Sam Spilsbury on 2012-08-01

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3474. By Sam Spilsbury on 2012-08-01

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3475. By Sam Spilsbury on 2012-08-01

Fix merge marker

3476. By Sam Spilsbury on 2012-08-01

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3477. By Sam Spilsbury on 2012-08-01

Add match-list-setting to the mock schema

3478. By Sam Spilsbury on 2012-08-01

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3479. By Sam Spilsbury on 2012-08-01

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3480. By Sam Spilsbury on 2012-08-01

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3481. By Sam Spilsbury on 2012-08-01

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3482. By Sam Spilsbury on 2012-08-01

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3483. By Sam Spilsbury on 2012-08-01

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3484. By Sam Spilsbury on 2012-08-01

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3485. By Sam Spilsbury on 2012-08-01

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3486. By Sam Spilsbury on 2012-08-01

Enable info tests for gsettigs

3487. By Sam Spilsbury on 2012-08-01

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3488. By Sam Spilsbury on 2012-08-01

Use the much more sensible, law of demeter friendly version

3489. By Sam Spilsbury on 2012-08-01

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3490. By Sam Spilsbury on 2012-08-01

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3491. By Sam Spilsbury on 2012-08-02

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3492. By Sam Spilsbury on 2012-08-02

Added expectation stubs and fix crash

3493. By Sam Spilsbury on 2012-08-02

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3494. By Sam Spilsbury on 2012-08-02

Instantiate the tests and set the right expectations

3495. By Sam Spilsbury on 2012-08-02

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3496. By Sam Spilsbury on 2012-08-02

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3497. By Sam Spilsbury on 2012-08-02

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3498. By Sam Spilsbury on 2012-08-03

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3499. By Sam Spilsbury on 2012-08-03

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3500. By Sam Spilsbury on 2012-08-03

Pass the object allocator too

3501. By Sam Spilsbury on 2012-08-04

First steps to getting the wrapper under test

3502. By Sam Spilsbury on 2012-08-04

Merge

3503. By Sam Spilsbury on 2012-08-04

Merge

3504. By Sam Spilsbury on 2012-08-04

Backend conformance config really belongs in gsettings

3505. By Sam Spilsbury on 2012-08-04

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3506. By Sam Spilsbury on 2012-08-04

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3507. By Sam Spilsbury on 2012-08-04

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3508. By Sam Spilsbury on 2012-08-04

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3509. By Sam Spilsbury on 2012-08-04

Update for API changes

3510. By Sam Spilsbury on 2012-08-05

Merge and remove redundant code

3511. By Sam Spilsbury on 2012-08-05

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3512. By Sam Spilsbury on 2012-08-05

Test fixture for CCSGSettingsTestFindSettingAndPluginToUpdateFromPath

3513. By Sam Spilsbury on 2012-08-05

Comprehensive test coverage for FindSettingAndPluginToUpdateFromPath
and some cleanup, fix leaks etc

3514. By Sam Spilsbury on 2012-08-05

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3515. By Sam Spilsbury on 2012-08-05

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3516. By Sam Spilsbury on 2012-08-05

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3517. By Sam Spilsbury on 2012-08-05

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3518. By Sam Spilsbury on 2012-08-05

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3519. By Sam Spilsbury on 2012-08-05

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3520. By Sam Spilsbury on 2012-08-05

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3521. By Sam Spilsbury on 2012-08-05

Added stubs for tests, fixed double unrefs due to GSettings' really
annoying stealing behaviour

3522. By Sam Spilsbury on 2012-08-05

Instantiate the CCSBackendConformanceTestProfileHandling suite for
the GSettings backend conformance test

3523. By Sam Spilsbury on 2012-08-05

Fix more double unref

3524. By Sam Spilsbury on 2012-08-05

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3525. By Sam Spilsbury on 2012-08-05

Added AddProfile stub

3526. By Sam Spilsbury on 2012-08-05

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3527. By Sam Spilsbury on 2012-08-05

Add default and current profiles correctly

3528. By Sam Spilsbury on 2012-08-05

Handle default and current profile cases in the tests a little better

3529. By Sam Spilsbury on 2012-08-05

Merge

3530. By Sam Spilsbury on 2012-08-05

Merge

3531. By Sam Spilsbury on 2012-08-05

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3532. By Sam Spilsbury on 2012-08-05

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3533. By Sam Spilsbury on 2012-08-05

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3534. By Sam Spilsbury on 2012-08-05

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3535. By Sam Spilsbury on 2012-08-05

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3536. By Sam Spilsbury on 2012-08-05

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3537. By Sam Spilsbury on 2012-08-05

Correct expectations

3538. By Sam Spilsbury on 2012-08-05

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3539. By Sam Spilsbury on 2012-08-06

Merge

3540. By Sam Spilsbury on 2012-08-06

Fixed a set of memory leaks in the GSettings conformance tests - we must
be careful to unref the variants once they are read

3541. By Sam Spilsbury on 2012-08-06

Merge

3542. By Sam Spilsbury on 2012-08-06

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3543. By Sam Spilsbury on 2012-08-06

Remove dupe file

3544. By Sam Spilsbury on 2012-08-06

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3545. By Sam Spilsbury on 2012-08-06

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3546. By Sam Spilsbury on 2012-08-06

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3547. By Sam Spilsbury on 2012-08-06

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

Unmerged revisions

=== modified file 'compizconfig/gconf/src/gconf.c'
--- compizconfig/gconf/src/gconf.c	2012-07-21 20:44:19 +0000
+++ compizconfig/gconf/src/gconf.c	2012-07-21 20:44:20 +0000
@@ -436,6 +436,22 @@
 }
 
 static void
+updateSetting (CCSBackend *backend, CCSContext *context, CCSPlugin *plugin, CCSSetting *setting)
+{
+    int          index;
+    readInit (backend, context);
+    if (!readOption (setting))
+	ccsResetToDefault (setting, TRUE);
+
+    if (ccsGetIntegrationEnabled (context) &&
+	isIntegratedOption (setting, &index))
+    {
+	writeInit (backend, context);
+	writeIntegratedOption (context, setting, index);
+    }
+}
+
+static void
 valueChanged (GConfClient *client,
 	      guint       cnxn_id,
 	      GConfEntry  *entry,
@@ -445,7 +461,6 @@
     char         *keyName = (char*) gconf_entry_get_key (entry);
     char         *pluginName;
     char         *token;
-    int          index;
     unsigned int screenNum;
     CCSPlugin    *plugin;
     CCSSetting   *setting;
@@ -490,16 +505,9 @@
     if (!setting)
 	return;
 
-    readInit (NULL, context);
-    if (!readOption (setting))
-	ccsResetToDefault (setting, TRUE);
-
-    if (ccsGetIntegrationEnabled (context) &&
-	isIntegratedOption (setting, &index))
-    {
-	writeInit (NULL, context);
-	writeIntegratedOption (context, setting, index);
-    }
+    /* Passing null here is not optimal, but we are not
+     * maintaining gconf actively here */
+    updateSetting (NULL, context, plugin, setting);
 }
 
 static void
@@ -2167,6 +2175,7 @@
     writeInit,
     writeSetting,
     0,
+    updateSetting,
     getSettingIsIntegrated,
     getSettingIsReadOnly,
     getExistingProfiles,
 
=== modified file 'compizconfig/gsettings/gsettings_backend_shared/gsettings_util.c'
--- compizconfig/gsettings/gsettings_backend_shared/gsettings_util.c	2012-07-21 20:44:19 +0000
+++ compizconfig/gsettings/gsettings_backend_shared/gsettings_util.c	2012-07-21 20:44:20 +0000
@@ -4,6 +4,8 @@
 #include <stdio.h>
 #include "gsettings_shared.h"
 
+INTERFACE_TYPE (CCSGSettingsBackendInterface);
+
 GList *
 variantTypeToPossibleSettingType (const gchar *vt)
 {
@@ -328,6 +330,101 @@
     return found;
 }
 
+Bool
+findSettingAndPluginToUpdateFromPath (GSettings  *settings,
+				      const char *path,
+				      const gchar *keyName,
+				      CCSContext *context,
+				      CCSPlugin **plugin,
+				      CCSSetting **setting,
+				      char **uncleanKeyName)
+{
+    char         *pluginName;
+    unsigned int screenNum;
+
+    if (!decomposeGSettingsPath (path, &pluginName, &screenNum))
+	return FALSE;
+
+    *plugin = ccsFindPlugin (context, pluginName);
+
+    if (*plugin)
+    {
+	*uncleanKeyName = translateKeyForCCS (keyName);
+
+	*setting = ccsFindSetting (*plugin, *uncleanKeyName);
+	if (!setting)
+	{
+	    /* Couldn't find setting straight off the bat,
+	     * try and find the best match */
+	    GVariant *value = g_settings_get_value (settings, keyName);
+
+	    if (value)
+	    {
+		GList *possibleSettingTypes = variantTypeToPossibleSettingType (g_variant_get_type_string (value));
+		GList *iter = possibleSettingTypes;
+
+		while (iter)
+		{
+		    *setting = attemptToFindCCSSettingFromLossyName (ccsGetPluginSettings (*plugin),
+								     keyName,
+								     (CCSSettingType) GPOINTER_TO_INT (iter->data));
+
+		    if (*setting)
+			break;
+
+		    iter = iter->next;
+		}
+
+		g_list_free (possibleSettingTypes);
+		g_variant_unref (value);
+	    }
+	}
+    }
+
+    g_free (pluginName);
+
+    if (!*plugin || !*setting)
+	return FALSE;
+
+    return TRUE;
+}
+
+Bool
+updateSettingWithGSettingsKeyName (CCSBackend *backend,
+				   GSettings *settings,
+				   gchar     *keyName,
+				   CCSBackendUpdateFunc updateSetting)
+{
+    CCSContext   *context = ccsGSettingsBackendGetContext (backend);
+    char	 *uncleanKeyName = NULL;
+    char	 *pathOrig;
+    CCSPlugin    *plugin;
+    CCSSetting   *setting;
+    Bool         ret = TRUE;
+
+    g_object_get (G_OBJECT (settings), "path", &pathOrig, NULL);
+
+    if (findSettingAndPluginToUpdateFromPath (settings, pathOrig, keyName, context, &plugin, &setting, &uncleanKeyName))
+	(*updateSetting) (backend, context, plugin, setting);
+    else
+    {
+	/* We hit a situation where either the key stored in GSettings couldn't be
+	 * matched at all to a key in the xml file, or where there were multiple matches.
+	 * Unfortunately, there isn't much we can do about this, other than try
+	 * and warn the user and bail out. It just means that if the key was updated
+	 * externally we won't know about the change until the next reload of settings */
+	 ccsWarning ("Unable to find setting %s, for path %s", uncleanKeyName, pathOrig);
+	 ret = FALSE;
+    }
+
+    g_free (pathOrig);
+
+    if (uncleanKeyName)
+	free (uncleanKeyName);
+
+    return ret;
+}
+
 gchar *
 makeCompizProfilePath (const gchar *profilename)
 {
@@ -373,7 +470,7 @@
 }
 
 GVariant *
-getVariantAtKey (GSettings *settings, char *key, const char *pathName, CCSSettingType type)
+getVariantAtKey (GSettings *settings, const char *key, const char *pathName, CCSSettingType type)
 {
     GVariant *gsettingsValue = g_settings_get_value (settings, key);
 
@@ -390,7 +487,7 @@
 readListValue (GVariant *gsettingsValue, CCSSettingType listType)
 {
     gboolean		hasVariantType;
-    unsigned int        nItems, i = 0;
+    unsigned int        nItems;
     CCSSettingValueList list = NULL;
     GVariantIter	iter;
 
@@ -415,7 +512,7 @@
 
 	    /* Reads each item from the variant into arrayCounter */
 	    while (g_variant_iter_loop (&iter, "b", &value))
-		*arrayCounter++ = value;
+		*arrayCounter++ = value ? TRUE : FALSE;
 
 	    list = ccsGetValueListFromBoolArray (array, nItems, NULL);
 	    free (array);
@@ -440,8 +537,8 @@
 	break;
     case TypeFloat:
 	{
-	    double *array = malloc (nItems * sizeof (double));
-	    double *arrayCounter = array;
+	    float *array = malloc (nItems * sizeof (float));
+	    float *arrayCounter = array;
 	    gdouble value;
 
 	    if (!array)
@@ -451,7 +548,7 @@
 	    while (g_variant_iter_loop (&iter, "d", &value))
 		*arrayCounter++ = value;
 
-	    list = ccsGetValueListFromFloatArray ((float *) array, nItems, NULL);
+	    list = ccsGetValueListFromFloatArray (array, nItems, NULL);
 	    free (array);
 	}
 	break;
@@ -477,18 +574,20 @@
 	break;
     case TypeColor:
 	{
-	    CCSSettingColorValue *array;
 	    char		 *colorValue;
-	    array = malloc (nItems * sizeof (CCSSettingColorValue));
+	    CCSSettingColorValue *array = calloc (1, nItems * sizeof (CCSSettingColorValue));
+	    unsigned int i = 0;
+
 	    if (!array)
 		break;
 
 	    while (g_variant_iter_loop (&iter, "s", &colorValue))
 	    {
-		memset (&array[i], 0, sizeof (CCSSettingColorValue));
 		ccsStringToColor (colorValue,
 				  &array[i]);
+		i++;
 	    }
+
 	    list = ccsGetValueListFromColorArray (array, nItems, NULL);
 	    free (array);
 	}
@@ -667,7 +766,7 @@
     return TRUE;
 }
 
-Bool writeStringToVariant (char *value, GVariant **variant)
+Bool writeStringToVariant (const char *value, GVariant **variant)
 {
     *variant = g_variant_new_string (value);
     return TRUE;
@@ -744,3 +843,34 @@
     free (edgeString);
     return TRUE;
 }
+
+void
+writeVariantToKey (GSettings  *settings,
+		   const char *key,
+		   GVariant   *value)
+{
+    g_settings_set_value (settings, key, value);
+}
+
+CCSContext *
+ccsGSettingsBackendGetContext (CCSBackend *backend)
+{
+    return (*(GET_INTERFACE (CCSGSettingsBackendInterface, backend))->gsettingsBackendGetContext) (backend);
+}
+
+
+void
+ccsGSettingsBackendConnectToChangedSignal (CCSBackend *backend,
+					   GObject *object)
+{
+     (*(GET_INTERFACE (CCSGSettingsBackendInterface, backend))->gsettingsBackendConnectToChangedSignal) (backend, object);
+}
+
+GSettings *
+ccsGSettingsGetSettingsObjectForPluginWithPath (CCSBackend *backend,
+						const char *plugin,
+						const char *path,
+						CCSContext *context)
+{
+    return (*(GET_INTERFACE (CCSGSettingsBackendInterface, backend))->gsettingsBackendGetSettingsObjectForPluginWithPath) (backend, plugin, path, context);
+}
 
=== modified file 'compizconfig/gsettings/gsettings_backend_shared/gsettings_util.h'
--- compizconfig/gsettings/gsettings_backend_shared/gsettings_util.h	2012-07-21 20:44:19 +0000
+++ compizconfig/gsettings/gsettings_backend_shared/gsettings_util.h	2012-07-21 20:44:20 +0000
@@ -1,10 +1,38 @@
 #ifndef _COMPIZ_GSETTINGS_UTIL_H
 #define _COMPIZ_GSETTINGS_UTIL_H
 
+#include <ccs.h>
+#include <ccs-backend.h>
+
+COMPIZCONFIG_BEGIN_DECLS
+
 #include <glib.h>
 #include <glib-object.h>
 #include <gio/gio.h>
-#include <ccs.h>
+
+typedef struct _CCSGSettingsBackendPrivate CCSGettingsBackendPrivate;
+typedef struct _CCSGSettingsBackendInterface CCSGSettingsBackendInterface;
+
+typedef CCSContext * (*CCSGSettingsBackendGetContext) (CCSBackend *);
+typedef void (*CCSGSettingsBackendConnectToChangedSignal) (CCSBackend *, GObject *);
+typedef GSettings * (*CCSGSettingsBackendGetSettingsObjectForPluginWithPath) (CCSBackend *backend,
+									      const char *plugin,
+									      const char *path,
+									      CCSContext *context);
+
+struct _CCSGSettingsBackendInterface
+{
+    CCSGSettingsBackendGetContext gsettingsBackendGetContext;
+    CCSGSettingsBackendConnectToChangedSignal gsettingsBackendConnectToChangedSignal;
+    CCSGSettingsBackendGetSettingsObjectForPluginWithPath gsettingsBackendGetSettingsObjectForPluginWithPath;
+};
+
+struct _CCSGSettingsBackendPrivate
+{
+    CCSContext *context;
+};
+
+unsigned int ccsCCSGSettingsBackendInterfaceGetType ();
 
 gchar *
 getSchemaNameForPlugin (const char *plugin);
@@ -57,6 +85,20 @@
 CCSSetting *
 attemptToFindCCSSettingFromLossyName (CCSSettingList settingList, const gchar *lossyName, CCSSettingType type);
 
+Bool
+findSettingAndPluginToUpdateFromPath (GSettings  *settings,
+				      const char *path,
+				      const gchar *keyName,
+				      CCSContext *context,
+				      CCSPlugin **plugin,
+				      CCSSetting **setting,
+				      char **uncleanKeyName);
+
+Bool updateSettingWithGSettingsKeyName (CCSBackend *backend,
+					GSettings *settings,
+					gchar     *keyName,
+					CCSBackendUpdateFunc updateSetting);
+
 GList *
 variantTypeToPossibleSettingType (const gchar *vt);
 
@@ -73,7 +115,7 @@
 checkReadVariantIsValid (GVariant *gsettingsValue, CCSSettingType type, const gchar *pathName);
 
 GVariant *
-getVariantAtKey (GSettings *settings, char *key, const char *pathName, CCSSettingType type);
+getVariantAtKey (GSettings *settings, const char *key, const char *pathName, CCSSettingType type);
 
 const char * readStringFromVariant (GVariant *gsettingsValue);
 
@@ -99,7 +141,7 @@
 		CCSSettingType	    listType,
 		GVariant	    **gsettingsValue);
 
-Bool writeStringToVariant (char *value, GVariant **variant);
+Bool writeStringToVariant (const char *value, GVariant **variant);
 
 Bool writeFloatToVariant (float value, GVariant **variant);
 
@@ -115,4 +157,22 @@
 
 Bool writeEdgeToVariant (unsigned int edges, GVariant **variant);
 
+void writeVariantToKey (GSettings  *settings,
+			const char *key,
+			GVariant   *value);
+
+CCSContext *
+ccsGSettingsBackendGetContext (CCSBackend *backend);
+
+void
+ccsGSettingsBackendConnectToChangedSignal (CCSBackend *backend, GObject *object);
+
+GSettings *
+ccsGSettingsGetSettingsObjectForPluginWithPath (CCSBackend *backend,
+						const char *plugin,
+						const char *path,
+						CCSContext *context);
+
+COMPIZCONFIG_END_DECLS
+
 #endif
 
=== modified file 'compizconfig/gsettings/src/gconf-integration.c'
--- compizconfig/gsettings/src/gconf-integration.c	2012-07-21 20:44:19 +0000
+++ compizconfig/gsettings/src/gconf-integration.c	2012-07-21 20:44:20 +0000
@@ -537,7 +537,8 @@
 }
 
 Bool
-readGConfIntegratedOption (CCSContext *context,
+readGConfIntegratedOption (CCSBackend *backend,
+			   CCSContext *context,
 			   CCSSetting *setting,
 			   int	      index)
 {
@@ -545,7 +546,7 @@
     GError     *err = NULL;
     Bool       ret = FALSE;
     
-    ret = readOption (setting);
+    ret = readOption (backend, setting);
 
     gconfValue = gconf_client_get (client,
 				   specialOptions[index].gnomeName,
@@ -765,7 +766,8 @@
 }
 
 void
-writeGConfIntegratedOption (CCSContext *context,
+writeGConfIntegratedOption (CCSBackend *backend,
+			    CCSContext *context,
 			    CCSSetting *setting,
 			    int	       index)
 {
 
=== modified file 'compizconfig/gsettings/src/gsettings.c'
--- compizconfig/gsettings/src/gsettings.c	2012-07-21 20:44:19 +0000
+++ compizconfig/gsettings/src/gsettings.c	2012-07-21 20:44:20 +0000
@@ -46,15 +46,20 @@
 
 char *currentProfile = NULL;
 
+/* This will need to be rempved */
+CCSContext *storedContext = NULL;
+
 /* some forward declarations */
-static void writeIntegratedOption (CCSContext *context,
+static void writeIntegratedOption (CCSBackend *backend,
+				   CCSContext *context,
 				   CCSSetting *setting,
 				   int        index);
 
 static GSettings *
-getSettingsObjectForPluginWithPath (const char *plugin,
-				  const char *path,
-				  CCSContext *context)
+ccsGSettingsBackendGetSettingsObjectForPluginWithPathDefault (CCSBackend *backend,
+							      const char *plugin,
+							      const char *path,
+							      CCSContext *context)
 {
     GSettings *settingsObj = NULL;
     gchar *schemaName = getSchemaNameForPlugin (plugin);
@@ -74,7 +79,7 @@
     
     settingsObj = g_settings_new_with_path (schemaName, path);
 
-    g_signal_connect (G_OBJECT (settingsObj), "changed", (GCallback) valueChanged, (gpointer) context);
+    ccsGSettingsBackendConnectToChangedSignal (backend, G_OBJECT (settingsObj));
 
     settingsList = g_list_append (settingsList, (void *) settingsObj);
 
@@ -104,14 +109,15 @@
 }
 
 static GSettings *
-getSettingsObjectForCCSSetting (CCSSetting *setting)
+getSettingsObjectForCCSSetting (CCSBackend *backend, CCSSetting *setting)
 {
     GSettings *ret = NULL;
     gchar *pathName = makeSettingPath (setting);
 
-    ret = getSettingsObjectForPluginWithPath (ccsPluginGetName (ccsSettingGetParent (setting)),
-					       pathName,
-					       ccsPluginGetContext (ccsSettingGetParent (setting)));
+    ret = ccsGSettingsGetSettingsObjectForPluginWithPath (backend,
+							  ccsPluginGetName (ccsSettingGetParent (setting)),
+							  pathName,
+							  ccsPluginGetContext (ccsSettingGetParent (setting)));
 
     g_free (pathName);
     return ret;
@@ -129,113 +135,57 @@
 }
 
 static void
+updateSetting (CCSBackend *backend, CCSContext *context, CCSPlugin *plugin, CCSSetting *setting)
+{
+    int          index;
+
+    readInit (backend, context);
+    if (!readOption (backend,  setting))
+    {
+	ccsResetToDefault (setting, TRUE);
+    }
+
+    if (ccsGetIntegrationEnabled (context) &&
+	isIntegratedOption (setting, &index))
+    {
+	writeInit (backend, context);
+	writeIntegratedOption (backend, context, setting, index);
+    }
+}
+
+static void
 valueChanged (GSettings   *settings,
 	      gchar	  *keyName,
 	      gpointer    user_data)
 {
-    CCSContext   *context = (CCSContext *)user_data;
-    char	 *uncleanKeyName;
-    char	 *path, *pathOrig;
-    char         *pluginName;
-    int          index;
-    unsigned int screenNum;
-    CCSPlugin    *plugin;
-    CCSSetting   *setting;
-
-    g_object_get (G_OBJECT (settings), "path", &pathOrig, NULL);
-
-    path = pathOrig;
-
-    if (!decomposeGSettingsPath (path, &pluginName, &screenNum))
-    {
-	g_free (pathOrig);
-	return;
-    }
-
-    plugin = ccsFindPlugin (context, pluginName);
-
-    uncleanKeyName = translateKeyForCCS (keyName);
-
-    setting = ccsFindSetting (plugin, uncleanKeyName);
-    if (!setting)
-    {
-	/* Couldn't find setting straight off the bat,
-	 * try and find the best match */
-	GVariant *value = g_settings_get_value (settings, keyName);
-
-	if (value)
-	{
-	    GList *possibleSettingTypes = variantTypeToPossibleSettingType (g_variant_get_type_string (value));
-	    GList *iter = possibleSettingTypes;
-
-	    while (iter)
-	    {
-		setting = attemptToFindCCSSettingFromLossyName (ccsGetPluginSettings (plugin),
-								keyName,
-								(CCSSettingType) GPOINTER_TO_INT (iter->data));
-
-		if (setting)
-		    break;
-
-		iter = iter->next;
-	    }
-
-	    g_list_free (possibleSettingTypes);
-	    g_variant_unref (value);
-	}
-
-	/* We hit a situation where either the key stored in GSettings couldn't be
-	 * matched at all to a key in the xml file, or where there were multiple matches.
-	 * Unfortunately, there isn't much we can do about this, other than try
-	 * and warn the user and bail out. It just means that if the key was updated
-	 * externally we won't know about the change until the next reload of settings */
-	if (!setting)
-	{
-	    ccsWarning ("Unable to find setting %s, for path %s", uncleanKeyName, path);
-	    g_free (pluginName);
-	    free (uncleanKeyName);
-	    g_free (pathOrig);
-	    return;
-	}
-    }
-
-    readInit (NULL, context);
-    if (!readOption (setting))
-    {
-	ccsResetToDefault (setting, TRUE);
-    }
-
-    if (ccsGetIntegrationEnabled (context) &&
-	isIntegratedOption (setting, &index))
-    {
-	writeInit (NULL, context);
-	writeIntegratedOption (context, setting, index);
-    }
-
-    g_free (pluginName);
-    free (uncleanKeyName);
-    g_free (pathOrig);
+    CCSBackend   *backend = (CCSBackend *)user_data;
+
+    updateSettingWithGSettingsKeyName (backend, settings, keyName, updateSetting);
 }
 
 static Bool
-readIntegratedOption (CCSContext *context,
+readIntegratedOption (CCSBackend *backend,
+		      CCSContext *context,
 		      CCSSetting *setting,
 		      int        index)
 {
 #ifdef USE_GCONF
-    return readGConfIntegratedOption (context, setting, index);
+    return readGConfIntegratedOption (backend, context, setting, index);
 #else
     return FALSE;
 #endif
 }
 
 static GVariant *
-getVariantForCCSSetting (CCSSetting *setting)
+getVariantForCCSSetting (CCSBackend *backend, CCSSetting *setting)
 {
-    GSettings  *settings = getSettingsObjectForCCSSetting (setting);
+    GSettings  *settings = getSettingsObjectForCCSSetting (backend, setting);
     char *cleanSettingName = getNameForCCSSetting (setting);
     gchar *pathName = makeSettingPath (setting);
-    GVariant *gsettingsValue = getVariantAtKey (settings, cleanSettingName, pathName, ccsSettingGetType (setting));
+    GVariant *gsettingsValue = getVariantAtKey (settings,
+						cleanSettingName,
+						pathName,
+						ccsSettingGetType (setting));
 
     free (cleanSettingName);
     free (pathName);
@@ -243,7 +193,7 @@
 }
 
 Bool
-readOption (CCSSetting * setting)
+readOption (CCSBackend *backend, CCSSetting * setting)
 {
     Bool       ret = FALSE;
     GVariant   *gsettingsValue = NULL;
@@ -259,7 +209,7 @@
 	return FALSE;
     }
 
-    gsettingsValue = getVariantForCCSSetting (setting);
+    gsettingsValue = getVariantForCCSSetting (backend, setting);
 
     switch (ccsSettingGetType (setting))
     {
@@ -397,21 +347,22 @@
 }
 
 static void
-writeIntegratedOption (CCSContext *context,
+writeIntegratedOption (CCSBackend *backend,
+		       CCSContext *context,
 		       CCSSetting *setting,
 		       int        index)
 {
 #ifdef USE_GCONF
-    writeGConfIntegratedOption (context, setting, index);
+    writeGConfIntegratedOption (backend, context, setting, index);
 #endif
 
     return;
 }
 
 static void
-resetOptionToDefault (CCSSetting * setting)
+resetOptionToDefault (CCSBackend *backend, CCSSetting * setting)
 {
-    GSettings  *settings = getSettingsObjectForCCSSetting (setting);
+    GSettings  *settings = getSettingsObjectForCCSSetting (backend, setting);
   
     char *cleanSettingName = translateKeyForGSettings (ccsSettingGetName (setting));
 
@@ -421,9 +372,9 @@
 }
 
 void
-writeOption (CCSSetting * setting)
+writeOption (CCSBackend *backend, CCSSetting * setting)
 {
-    GSettings  *settings = getSettingsObjectForCCSSetting (setting);
+    GSettings  *settings = getSettingsObjectForCCSSetting (backend, setting);
     char *cleanSettingName = translateKeyForGSettings (ccsSettingGetName (setting));
     GVariant *gsettingsValue = NULL;
     Bool success = FALSE;
@@ -447,6 +398,7 @@
 		success = writeStringToVariant (value, &gsettingsValue);
 	    }
 	}
+	break;
     case TypeFloat:
 	{
 	    float value;
@@ -525,7 +477,6 @@
 	break;
     case TypeList:
 	{
-	    GVariant *value = NULL;
 	    CCSSettingValueList  list = NULL;
 
 	    if (!ccsGetList (setting, &list))
@@ -533,7 +484,7 @@
 
 	    success = writeListValue (list,
 				      ccsSettingGetInfo (setting)->forList.listType,
-				      &value);
+				      &gsettingsValue);
 	}
 	break;
     default:
@@ -546,7 +497,7 @@
     {
 	/* g_settings_set_value will consume the reference
 	 * so there is no need to unref value here */
-	g_settings_set_value (settings, cleanSettingName, gsettingsValue);
+	writeVariantToKey (settings, cleanSettingName, gsettingsValue);
     }
 
     free (cleanSettingName);
@@ -644,6 +595,24 @@
     }
 }
 
+static CCSContext *
+ccsGSettingsBackendGetContextDefault (CCSBackend *backend)
+{
+    return storedContext;
+}
+
+static void
+ccsGSettingsBackendConnectToValueChangedSignalDefault (CCSBackend *backend, GObject *object)
+{
+    g_signal_connect (object, "changed", (GCallback) valueChanged, (gpointer) backend);
+}
+
+static CCSGSettingsBackendInterface gsettingsAdditionalDefaultInterface = {
+    ccsGSettingsBackendGetContextDefault,
+    ccsGSettingsBackendConnectToValueChangedSignalDefault,
+    ccsGSettingsBackendGetSettingsObjectForPluginWithPathDefault
+};
+
 static Bool
 initBackend (CCSBackend *backend, CCSContext * context)
 {
@@ -663,6 +632,10 @@
 
     g_free (currentProfilePath);
 
+    storedContext = context;
+
+    ccsObjectAddInterface (backend, (CCSInterface *) &gsettingsAdditionalDefaultInterface, GET_INTERFACE_TYPE (CCSGSettingsBackendInterface));
+
     return TRUE;
 }
 
@@ -690,6 +663,8 @@
 	l = g_list_next (l);
     }
 
+    settingsList = NULL;
+
     if (currentProfileSettings)
     {
 	g_object_unref (currentProfileSettings);
@@ -698,6 +673,8 @@
 
     g_object_unref (G_OBJECT (compizconfigSettings));
 
+    compizconfigSettings = NULL;
+
     processEvents (backend, 0);
     return TRUE;
 }
@@ -719,10 +696,10 @@
     if (ccsGetIntegrationEnabled (context) &&
 	isIntegratedOption (setting, &index))
     {
-	status = readIntegratedOption (context, setting, index);
+	status = readIntegratedOption (backend, context, setting, index);
     }
     else
-	status = readOption (setting);
+	status = readOption (backend, setting);
 
     if (!status)
 	ccsResetToDefault (setting, TRUE);
@@ -744,14 +721,14 @@
     if (ccsGetIntegrationEnabled (context) &&
 	isIntegratedOption (setting, &index))
     {
-	writeIntegratedOption (context, setting, index);
+	writeIntegratedOption (backend, context, setting, index);
     }
     else if (ccsSettingGetIsDefault (setting))
     {
-	resetOptionToDefault (setting);
+	resetOptionToDefault (backend, setting);
     }
     else
-	writeOption (setting);
+	writeOption (backend, setting);
 
 }
 
@@ -821,7 +798,7 @@
 	GSettings *settings;
 	gchar *pathName = makeCompizPluginPath (currentProfile, plugin);
 
-	settings = getSettingsObjectForPluginWithPath (plugin, pathName, context);
+	settings = ccsGSettingsGetSettingsObjectForPluginWithPath (backend, plugin, pathName, context);
 	g_free (pathName);
 
 	/* The GSettings documentation says not to use this API
@@ -916,12 +893,15 @@
     writeInit,
     writeSetting,
     0,
+    updateSetting,
     getSettingIsIntegrated,
     getSettingIsReadOnly,
     getExistingProfiles,
     deleteProfile
 };
 
+
+
 CCSBackendInterface *
 getBackendInfo (void)
 {
 
=== modified file 'compizconfig/gsettings/src/gsettings.h'
--- compizconfig/gsettings/src/gsettings.h	2012-07-21 20:44:19 +0000
+++ compizconfig/gsettings/src/gsettings.h	2012-07-21 20:44:20 +0000
@@ -68,9 +68,9 @@
 
 Bool readInit (CCSBackend *, CCSContext * context);
 void readSetting (CCSBackend *, CCSContext * context, CCSSetting * setting);
-Bool readOption (CCSSetting * setting);
+Bool readOption (CCSBackend *backend, CCSSetting * setting);
 Bool writeInit (CCSBackend *, CCSContext * context);
-void writeOption (CCSSetting *setting);
+void writeOption (CCSBackend *backend, CCSSetting *setting);
 
 #ifdef USE_GCONF
 
@@ -106,12 +106,14 @@
 finiGConfClient (void);
 
 Bool
-readGConfIntegratedOption (CCSContext *context,
+readGConfIntegratedOption (CCSBackend *backend,
+			   CCSContext *context,
 			   CCSSetting *setting,
 			   int	      index);
 
 void
-writeGConfIntegratedOption (CCSContext *context,
+writeGConfIntegratedOption (CCSBackend *backend,
+			    CCSContext *context,
 			    CCSSetting *setting,
 			    int	       index);
 
 
=== modified file 'compizconfig/gsettings/tests/CMakeLists.txt'
--- compizconfig/gsettings/tests/CMakeLists.txt	2012-07-21 20:44:19 +0000
+++ compizconfig/gsettings/tests/CMakeLists.txt	2012-07-21 20:44:20 +0000
@@ -1,10 +1,16 @@
+include (CompizGSettings)
+
 include_directories (${CMAKE_CURRENT_SOURCE_DIR}
+		     ${CMAKE_CURRENT_BINARY_DIR}
                      ${CMAKE_CURRENT_SOURCE_DIR}/../src
                      ${CMAKE_CURRENT_SOURCE_DIR}/../../libcompizconfig/tests
-		     ${CMAKE_CURRENT_SOURCE_DIR}/../../mocks/libcompizconfig)
+		     ${CMAKE_CURRENT_SOURCE_DIR}/../../mocks/libcompizconfig
+		     ${CMAKE_CURRENT_SOURCE_DIR}/../../tests)
 
 pkg_check_modules (COMPIZCONFIG_TEST_GSETTINGS libcompizconfig)
 
+link_directories (${CMAKE_CURRENT_BINARY_DIR}/../../libcompizconfig/tests)
+
 add_executable (compizconfig_test_gsettings
 		${CMAKE_CURRENT_SOURCE_DIR}/gsettings_mocks.cpp
 		${CMAKE_CURRENT_SOURCE_DIR}/test_gsettings_tests.cpp
@@ -12,7 +18,8 @@
 		${CMAKE_CURRENT_SOURCE_DIR}/gsettings_mocks.h
 		${CMAKE_CURRENT_SOURCE_DIR}/test_gsettings_tests.h)
 
-link_directories (${CMAKE_CURRENT_BINARY_DIR}/../../libcompizconfig/tests)
+add_executable (compizconfig_test_gsettings_conformance
+		${CMAKE_CURRENT_SOURCE_DIR}/test_gsettings_conformance.cpp)
 
 target_link_libraries (compizconfig_test_gsettings
 		       gsettings_backend_shared
@@ -21,4 +28,27 @@
 		       ${GTEST_BOTH_LIBRARIES}
 		       ${GMOCK_MAIN_LIBRARY})
 
+configure_file (${CMAKE_CURRENT_SOURCE_DIR}/backend-conformance-config.h.in
+		${CMAKE_CURRENT_BINARY_DIR}/backend-conformance-config.h)
+
+add_custom_command (OUTPUT ${CMAKE_BINARY_DIR}/generated/glib-2.0/schemas/org.compiz.mock.gschema.xml
+		    COMMAND cp -r ${CMAKE_CURRENT_SOURCE_DIR}/org.compiz.mock.gschema.xml ${CMAKE_BINARY_DIR}/generated/glib-2.0/schemas/org.compiz.mock.gschema.xml
+		    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/org.compiz.mock.gschema.xml
+		    VERBATIM)
+
+add_custom_target (compiz_gsettings_mock_schema ALL
+		   DEPENDS ${CMAKE_BINARY_DIR}/generated/glib-2.0/schemas/org.compiz.mock.gschema.xml)
+
+add_gsettings_schema_to_recompilation_list (compiz_gsettings_mock_schema)
+
+target_link_libraries (compizconfig_test_gsettings_conformance
+		       gsettings_backend_shared
+		       compizconfig_ccs_setting_mock
+		       compizconfig_ccs_plugin_mock
+		       compizconfig_ccs_context_mock
+		       ${COMPIZCONFIG_TEST_GSETTINGS_LIBRARIES}
+		       ${GTEST_BOTH_LIBRARIES}
+		       ${GMOCK_MAIN_LIBRARY})
+
 compiz_discover_tests (compizconfig_test_gsettings)
+compiz_discover_tests (compizconfig_test_gsettings_conformance)
 
=== added file 'compizconfig/gsettings/tests/backend-conformance-config.h.in'
--- compizconfig/gsettings/tests/backend-conformance-config.h.in	1970-01-01 00:00:00 +0000
+++ compizconfig/gsettings/tests/backend-conformance-config.h.in	2012-07-21 20:44:20 +0000
@@ -0,0 +1,2 @@
+#define BACKEND_BINARY_PATH "@CMAKE_BINARY_DIR@/compizconfig/gsettings"
+#define MOCK_SCHEMA_PATH "@CMAKE_BINARY_DIR@/generated/glib-2.0/schemas"
 
=== added file 'compizconfig/gsettings/tests/org.compiz.mock.gschema.xml'
--- compizconfig/gsettings/tests/org.compiz.mock.gschema.xml	1970-01-01 00:00:00 +0000
+++ compizconfig/gsettings/tests/org.compiz.mock.gschema.xml	2012-07-21 20:44:20 +0000
@@ -0,0 +1,50 @@
+<?xml version="1.0"?>
+<schemalist>
+  <schema id="org.compiz.mock" gettext-domain="compiz">
+    <key type="i" name="integer-setting">
+      <default>0</default>
+    </key>
+    <key type="b" name="boolean-setting">
+      <default>false</default>
+    </key>
+    <key type="d" name="float-setting">
+      <default>0.0</default>
+    </key>
+    <key type="s" name="string-setting">
+      <default>""</default>
+    </key>
+    <key type="s" name="match-setting">
+      <default>""</default>
+    </key>
+    <key type="b" name="bell-setting">
+      <default>false</default>
+    </key>
+    <key type="s" name="color-setting">
+      <default>""</default>
+    </key>
+    <key type="s" name="key-setting">
+      <default>""</default>
+    </key>
+    <key type="s" name="button-setting">
+      <default>""</default>
+    </key>
+    <key type="s" name="edge-setting">
+      <default>""</default>
+    </key>
+    <key type="ai" name="int-list-setting">
+      <default>[0]</default>
+    </key>
+    <key type="ad" name="float-list-setting">
+      <default>[0.0]</default>
+    </key>
+    <key type="ab" name="bool-list-setting">
+      <default>[true]</default>
+    </key>
+    <key type="as" name="string-list-setting">
+      <default>[""]</default>
+    </key>
+    <key type="as" name="color-list-setting">
+      <default>[""]</default>
+    </key>
+  </schema>
+</schemalist>
 
=== added file 'compizconfig/gsettings/tests/test_gsettings_conformance.cpp'
--- compizconfig/gsettings/tests/test_gsettings_conformance.cpp	1970-01-01 00:00:00 +0000
+++ compizconfig/gsettings/tests/test_gsettings_conformance.cpp	2012-07-21 20:44:20 +0000
@@ -0,0 +1,431 @@
+#include <gtest/gtest.h>
+#include <gmock/gmock.h>
+
+#include <gsettings_util.h>
+
+#include <gio/gio.h>
+
+#include "backend-conformance-config.h"
+
+#include <ccs.h>
+#include <compizconfig_backend_concept_test.h>
+
+#include <iostream>
+
+using ::testing::AtLeast;
+using ::testing::Pointee;
+using ::testing::ReturnNull;
+
+namespace
+{
+const std::string MOCK_SCHEMA ("org.compiz.mock");
+const std::string MOCK_PATH (MOCK_SCHEMA_PATH);
+}
+
+class CCSGSettingsBackendEnv :
+    public CCSBackendConceptTestEnvironmentInterface
+{
+    public:
+
+	CCSGSettingsBackendEnv () :
+	    pluginToMatch ("mock")
+	{
+	    g_type_init ();
+	}
+
+	/* A wrapper to prevent signals from being added */
+	static void connectToSignalWrapper (CCSBackend *backend, GObject *object)
+	{
+	};
+
+	CCSBackend * SetUp (CCSContext *context, CCSContextGMock *gmockContext)
+	{
+	    CCSBackendInterface *interface = NULL;
+	    Bool		fallback   = FALSE;
+
+	    g_setenv ("GSETTINGS_SCHEMA_DIR", MOCK_PATH.c_str (), true);
+	    g_setenv ("GSETTINGS_BACKEND", "memory", true);
+	    g_setenv ("LIBCOMPIZCONFIG_BACKEND_PATH", BACKEND_BINARY_PATH, true);
+
+	    mContext = context;
+
+	    std::string path ("gsettings");
+
+	    void *dlhand = ccsOpenBackend (path.c_str (), &interface, &fallback);
+
+	    EXPECT_FALSE (fallback);
+	    EXPECT_TRUE (dlhand);
+
+	    mGSettingsBackend = ccsBackendNewWithInterface (mContext, interface, dlhand);
+	    mBackend = ccsBackendWithCapabilitiesWrapBackend (&ccsDefaultInterfaceTable, mGSettingsBackend);
+
+	    CCSBackendInitFunc backendInit = (GET_INTERFACE (CCSBackendInterface, mBackend))->backendInit;
+
+	    if (backendInit)
+		(*backendInit) ((CCSBackend *) mBackend, mContext);
+
+	    overloadedInterface = *(GET_INTERFACE (CCSGSettingsBackendInterface, mGSettingsBackend));
+	    overloadedInterface.gsettingsBackendConnectToChangedSignal = CCSGSettingsBackendEnv::connectToSignalWrapper;
+
+	    ccsObjectRemoveInterface (mGSettingsBackend, GET_INTERFACE_TYPE (CCSGSettingsBackendInterface));
+	    ccsObjectAddInterface (mGSettingsBackend, (CCSInterface *) &overloadedInterface, GET_INTERFACE_TYPE (CCSGSettingsBackendInterface));
+
+	    mSettings = ccsGSettingsGetSettingsObjectForPluginWithPath (mGSettingsBackend, "mock", makeCompizPluginPath (profileName.c_str (), "mock"), mContext);
+
+	    ON_CALL (*gmockContext, getProfile ()).WillByDefault (Return (profileName.c_str ()));
+
+	    return (CCSBackend *) mBackend;
+	}
+
+	void TearDown (CCSBackend *)
+	{
+	    g_unsetenv ("GSETTINGS_SCHEMA_DIR");
+	    g_unsetenv ("GSETTINGS_BACKEND");
+	    g_unsetenv ("LIBCOMPIZCONFIG_BACKEND_PATH");
+
+	    ccsFreeBackendWithCapabilities (mBackend);
+	}
+
+	void PreWrite (CCSContextGMock *gmockContext,
+		       CCSPluginGMock  *gmockPlugin,
+		       CCSSettingGMock *gmockSetting,
+		       CCSSettingType  type)
+	{
+	    EXPECT_CALL (*gmockContext, getIntegrationEnabled ()).WillRepeatedly (Return (FALSE));
+	    EXPECT_CALL (*gmockPlugin, getContext ()).Times (AtLeast (1));
+	    EXPECT_CALL (*gmockPlugin, getName ()).Times (AtLeast (1));
+	    EXPECT_CALL (*gmockSetting, getType ()).Times (AtLeast (1));
+	    EXPECT_CALL (*gmockSetting, getName ()).Times (AtLeast (1));
+	    EXPECT_CALL (*gmockSetting, getParent ()).Times (AtLeast (1));
+	    EXPECT_CALL (*gmockSetting, getIsDefault ()).WillRepeatedly (Return (FALSE));
+	}
+
+	void PostWrite (CCSContextGMock *gmockContext,
+			CCSPluginGMock  *gmockPlugin,
+			CCSSettingGMock *gmockSetting,
+			CCSSettingType  type) {}
+
+	void WriteBoolAtKey (const std::string &plugin,
+			     const std::string &key,
+			     const VariantTypes &value)
+	{
+	    GVariant *variant = NULL;
+	    if (writeBoolToVariant (boolToBool (boost::get <bool> (value)), &variant))
+		writeVariantToKey (mSettings, CharacterWrapper (translateKeyForGSettings (key.c_str ())), variant);
+	    else
+		throw std::exception ();
+	}
+
+	void WriteIntegerAtKey (const std::string &plugin,
+				const std::string &key,
+				const VariantTypes &value)
+	{
+	    GVariant *variant = NULL;
+	    if (writeIntToVariant (boost::get <int> (value), &variant))
+		writeVariantToKey (mSettings, CharacterWrapper (translateKeyForGSettings (key.c_str ())), variant);
+	    else
+		throw std::exception ();
+	}
+
+	void WriteFloatAtKey (const std::string &plugin,
+				      const std::string &key,
+				      const VariantTypes &value)
+	{
+	    GVariant *variant = NULL;
+	    if (writeFloatToVariant (boost::get <float> (value), &variant))
+		writeVariantToKey (mSettings, CharacterWrapper (translateKeyForGSettings (key.c_str ())), variant);
+	    else
+		throw std::exception ();
+	}
+
+	void WriteStringAtKey (const std::string &plugin,
+				       const std::string &key,
+				       const VariantTypes &value)
+	{
+	    GVariant *variant = NULL;
+	    if (writeStringToVariant (boost::get <const char *> (value), &variant))
+		writeVariantToKey (mSettings, CharacterWrapper (translateKeyForGSettings (key.c_str ())), variant);
+	    else
+		throw std::exception ();
+	}
+
+	void WriteColorAtKey (const std::string &plugin,
+				       const std::string &key,
+				       const VariantTypes &value)
+	{
+	    GVariant *variant = NULL;
+	    if (writeColorToVariant (boost::get <CCSSettingColorValue> (value), &variant))
+		writeVariantToKey (mSettings, CharacterWrapper (translateKeyForGSettings (key.c_str ())), variant);
+	    else
+		throw std::exception ();
+	}
+
+	void WriteKeyAtKey (const std::string &plugin,
+				       const std::string &key,
+				       const VariantTypes &value)
+	{
+	    GVariant *variant = NULL;
+	    if (writeKeyToVariant (boost::get <CCSSettingKeyValue> (value), &variant))
+		writeVariantToKey (mSettings, CharacterWrapper (translateKeyForGSettings (key.c_str ())), variant);
+	    else
+		throw std::exception ();
+	}
+
+	void WriteButtonAtKey (const std::string &plugin,
+				       const std::string &key,
+				       const VariantTypes &value)
+	{
+	    GVariant *variant = NULL;
+	    if (writeButtonToVariant (boost::get <CCSSettingButtonValue> (value), &variant))
+		writeVariantToKey (mSettings, CharacterWrapper (translateKeyForGSettings (key.c_str ())), variant);
+	    else
+		throw std::exception ();
+	}
+
+	void WriteEdgeAtKey (const std::string &plugin,
+				       const std::string &key,
+				       const VariantTypes &value)
+	{
+	    GVariant *variant = NULL;
+	    if (writeEdgeToVariant (boost::get <unsigned int> (value), &variant))
+		writeVariantToKey (mSettings, CharacterWrapper (translateKeyForGSettings (key.c_str ())), variant);
+	    else
+		throw std::exception ();
+	}
+
+	void WriteMatchAtKey (const std::string &plugin,
+				      const std::string &key,
+				      const VariantTypes &value)
+	{
+	    GVariant *variant = NULL;
+	    if (writeStringToVariant (boost::get <const char *> (value), &variant))
+		writeVariantToKey (mSettings, CharacterWrapper (translateKeyForGSettings (key.c_str ())), variant);
+	    else
+		throw std::exception ();
+	}
+
+	void WriteBellAtKey (const std::string &plugin,
+				       const std::string &key,
+				       const VariantTypes &value)
+	{
+	    GVariant *variant = NULL;
+	    if (writeBoolToVariant (boolToBool (boost::get <bool> (value)), &variant))
+		writeVariantToKey (mSettings, CharacterWrapper (translateKeyForGSettings (key.c_str ())), variant);
+	    else
+		throw std::exception ();
+	}
+
+	void WriteListAtKey (const std::string &plugin,
+				     const std::string &key,
+				     const VariantTypes &value)
+	{
+	    GVariant *variant = NULL;
+
+	    const CCSListWrapper::Ptr &lw (boost::get <CCSListWrapper::Ptr> (value));
+
+	    if (writeListValue (*lw, lw->type (), &variant))
+		writeVariantToKey (mSettings, CharacterWrapper (translateKeyForGSettings (key.c_str ())), variant);
+	    else
+		throw std::exception ();
+	}
+
+	void PreRead (CCSContextGMock *gmockContext,
+		      CCSPluginGMock  *gmockPlugin,
+		      CCSSettingGMock *gmockSetting,
+		      CCSSettingType  type)
+	{
+	    EXPECT_CALL (*gmockContext, getIntegrationEnabled ()).WillOnce (Return (FALSE));
+	    EXPECT_CALL (*gmockPlugin, getContext ()).Times (AtLeast (1));
+	    EXPECT_CALL (*gmockPlugin, getName ()).Times (AtLeast (1));
+	    EXPECT_CALL (*gmockSetting, getType ()).Times (AtLeast (1));
+	    EXPECT_CALL (*gmockSetting, getName ()).Times (AtLeast (1));
+	    EXPECT_CALL (*gmockSetting, getParent ()).Times (AtLeast (1));
+	    EXPECT_CALL (*gmockSetting, isReadOnly ()).WillRepeatedly (Return (FALSE));
+
+	    if (type == TypeList)
+	    {
+		EXPECT_CALL (*gmockSetting, getInfo ()).Times (AtLeast (1));
+		EXPECT_CALL (*gmockSetting, getDefaultValue ()).WillRepeatedly (ReturnNull ());
+	    }
+	}
+
+	void PostRead (CCSContextGMock *gmockContext,
+		       CCSPluginGMock  *gmockPlugin,
+		       CCSSettingGMock *gmockSetting,
+		       CCSSettingType  type) {}
+
+	Bool ReadBoolAtKey (const std::string &plugin,
+			    const std::string &key)
+	{
+	    GVariant *variant = getVariantAtKey (mSettings,
+						 CharacterWrapper (translateKeyForGSettings (key.c_str ())),
+						 CharacterWrapper (makeCompizPluginPath (profileName.c_str (), plugin.c_str ())),
+						 TypeBool);
+	    return readBoolFromVariant (variant);
+	}
+
+	int ReadIntegerAtKey (const std::string &plugin,
+					const std::string &key)
+	{
+	    GVariant *variant = getVariantAtKey (mSettings,
+						 CharacterWrapper (translateKeyForGSettings (key.c_str ())),
+						 CharacterWrapper (makeCompizPluginPath (profileName.c_str (), plugin.c_str ())),
+						 TypeInt);
+	    return readIntFromVariant (variant);
+	}
+
+	float ReadFloatAtKey (const std::string &plugin,
+				      const std::string &key)
+	{
+	    GVariant *variant = getVariantAtKey (mSettings,
+						 CharacterWrapper (translateKeyForGSettings (key.c_str ())),
+						 CharacterWrapper (makeCompizPluginPath (profileName.c_str (), plugin.c_str ())),
+						 TypeFloat);
+	    return readFloatFromVariant (variant);
+	}
+
+	const char * ReadStringAtKey (const std::string &plugin,
+				      const std::string &key)
+	{
+	    GVariant *variant = getVariantAtKey (mSettings,
+						 CharacterWrapper (translateKeyForGSettings (key.c_str ())),
+						 CharacterWrapper (makeCompizPluginPath (profileName.c_str (), plugin.c_str ())),
+						 TypeString);
+	    return readStringFromVariant (variant);
+	}
+
+	CCSSettingColorValue ReadColorAtKey (const std::string &plugin,
+				       const std::string &key)
+	{
+	    Bool success = FALSE;
+	    GVariant *variant = getVariantAtKey (mSettings,
+						 CharacterWrapper (translateKeyForGSettings (key.c_str ())),
+						 CharacterWrapper (makeCompizPluginPath (profileName.c_str (), plugin.c_str ())),
+						 TypeColor);
+	    CCSSettingColorValue value = readColorFromVariant (variant, &success);
+	    EXPECT_TRUE (success);
+	    return value;
+	}
+
+	CCSSettingKeyValue ReadKeyAtKey (const std::string &plugin,
+				       const std::string &key)
+	{
+	    Bool success = FALSE;
+	    GVariant *variant = getVariantAtKey (mSettings,
+						 CharacterWrapper (translateKeyForGSettings (key.c_str ())),
+						 CharacterWrapper (makeCompizPluginPath (profileName.c_str (), plugin.c_str ())),
+						 TypeKey);
+	    CCSSettingKeyValue value = readKeyFromVariant (variant, &success);
+	    EXPECT_TRUE (success);
+	    return value;
+	}
+
+	CCSSettingButtonValue ReadButtonAtKey (const std::string &plugin,
+				       const std::string &key)
+	{
+	    Bool success = FALSE;
+	    GVariant *variant = getVariantAtKey (mSettings,
+						 CharacterWrapper (translateKeyForGSettings (key.c_str ())),
+						 CharacterWrapper (makeCompizPluginPath (profileName.c_str (), plugin.c_str ())),
+						 TypeButton);
+	    CCSSettingButtonValue value = readButtonFromVariant (variant, &success);
+	    EXPECT_TRUE (success);
+	    return value;
+	}
+
+	unsigned int ReadEdgeAtKey (const std::string &plugin,
+				       const std::string &key)
+	{
+	    GVariant *variant = getVariantAtKey (mSettings,
+						 CharacterWrapper (translateKeyForGSettings (key.c_str ())),
+						 CharacterWrapper (makeCompizPluginPath (profileName.c_str (), plugin.c_str ())),
+						 TypeEdge);
+	    return readEdgeFromVariant (variant);
+	}
+
+	const char * ReadMatchAtKey (const std::string &plugin,
+				     const std::string &key)
+	{
+	    GVariant *variant = getVariantAtKey (mSettings,
+						 CharacterWrapper (translateKeyForGSettings (key.c_str ())),
+						 CharacterWrapper (makeCompizPluginPath (profileName.c_str (), plugin.c_str ())),
+						 TypeMatch);
+	    return readStringFromVariant (variant);
+	}
+
+	Bool ReadBellAtKey (const std::string &plugin,
+				       const std::string &key)
+	{
+	    GVariant *variant = getVariantAtKey (mSettings,
+						 CharacterWrapper (translateKeyForGSettings (key.c_str ())),
+						 CharacterWrapper (makeCompizPluginPath (profileName.c_str (), plugin.c_str ())),
+						 TypeBell);
+	    return readBoolFromVariant (variant);
+	}
+
+	CCSSettingValueList ReadListAtKey (const std::string &plugin,
+				     const std::string &key,
+					   CCSSettingInfo    *info)
+	{
+	    GVariant *variant = getVariantAtKey (mSettings,
+						 CharacterWrapper (translateKeyForGSettings (key.c_str ())),
+						 CharacterWrapper (makeCompizPluginPath (profileName.c_str (), plugin.c_str ())),
+						 TypeList);
+	    return readListValue (variant, info->forList.listType);
+	}
+
+	void PreUpdate (CCSContextGMock *gmockContext,
+		      CCSPluginGMock  *gmockPlugin,
+		      CCSSettingGMock *gmockSetting,
+		      CCSSettingType  type)
+	{
+	    EXPECT_CALL (*gmockContext, getIntegrationEnabled ()).WillOnce (Return (FALSE));
+	    EXPECT_CALL (*gmockPlugin, getContext ()).Times (AtLeast (1));
+	    EXPECT_CALL (*gmockPlugin, getName ()).Times (AtLeast (1));
+	    EXPECT_CALL (*gmockSetting, getType ()).Times (AtLeast (1));
+	    EXPECT_CALL (*gmockSetting, getName ()).Times (AtLeast (1));
+	    EXPECT_CALL (*gmockSetting, getParent ()).Times (AtLeast (1));
+	    EXPECT_CALL (*gmockSetting, isReadOnly ()).WillRepeatedly (Return (FALSE));
+
+	    if (type == TypeList)
+	    {
+		EXPECT_CALL (*gmockSetting, getInfo ()).Times (AtLeast (1));
+		EXPECT_CALL (*gmockSetting, getDefaultValue ()).WillRepeatedly (ReturnNull ());
+	    }
+
+	    EXPECT_CALL (*gmockContext, getProfile ());
+	}
+
+	void PostUpdate (CCSContextGMock *gmockContext,
+		       CCSPluginGMock  *gmockPlugin,
+		       CCSSettingGMock *gmockSetting,
+		       CCSSettingType  type) {}
+
+	bool UpdateSettingAtKey (const std::string &plugin,
+				 const std::string &setting)
+	{
+	    CharacterWrapper keyName (translateKeyForGSettings (setting.c_str ()));
+
+	    if (updateSettingWithGSettingsKeyName (reinterpret_cast <CCSBackend *> (mGSettingsBackend), mSettings, keyName, ccsBackendUpdateSetting))
+		return true;
+
+	    return false;
+	}
+
+    private:
+
+	GSettings  *mSettings;
+	CCSContext *mContext;
+	CCSBackendWithCapabilities *mBackend;
+	CCSBackend		   *mGSettingsBackend;
+	std::string pluginToMatch;
+	CCSGSettingsBackendInterface overloadedInterface;
+
+	static const std::string profileName;
+};
+
+const std::string CCSGSettingsBackendEnv::profileName = "mock";
+
+INSTANTIATE_TEST_CASE_P (CCSGSettingsBackendConcept, CCSBackendConformanceTestReadWrite,
+			 compizconfig::test::GenerateTestingParametersForBackendInterface <CCSGSettingsBackendEnv> ());
+
 
=== modified file 'compizconfig/gsettings/tests/test_gsettings_tests.cpp'
--- compizconfig/gsettings/tests/test_gsettings_tests.cpp	2012-07-21 20:44:19 +0000
+++ compizconfig/gsettings/tests/test_gsettings_tests.cpp	2012-07-21 20:44:20 +0000
@@ -909,7 +909,7 @@
 {
     GVariant *v = g_variant_new ("i", 1);
 
-    EXPECT_FALSE (checkReadVariantIsValid (v, TypeInt, "foo/bar"));
+    EXPECT_TRUE (checkReadVariantIsValid (v, TypeInt, "foo/bar"));
 
     g_variant_unref (v);
 }
 
=== modified file 'compizconfig/libcompizconfig/backend/src/ini.c'
--- compizconfig/libcompizconfig/backend/src/ini.c	2012-07-21 20:44:19 +0000
+++ compizconfig/libcompizconfig/backend/src/ini.c	2012-07-21 20:44:20 +0000
@@ -605,6 +605,16 @@
     free (fileName);
 }
 
+static void
+updateSetting (CCSBackend *backend, CCSContext *context, CCSPlugin *plugin, CCSSetting *setting)
+{
+    if (readInit (backend, context))
+    {
+	readSetting (backend, context, setting);
+	readDone (backend, context);
+    }
+}
+
 static Bool
 getSettingIsReadOnly (CCSBackend *backend, CCSSetting * setting)
 {
@@ -762,6 +772,7 @@
     writeInit,
     writeSetting,
     writeDone,
+    updateSetting,
     NULL,
     getSettingIsReadOnly,
     getExistingProfiles,
 
=== modified file 'compizconfig/libcompizconfig/include/ccs-backend.h'
--- compizconfig/libcompizconfig/include/ccs-backend.h	2012-07-21 20:44:19 +0000
+++ compizconfig/libcompizconfig/include/ccs-backend.h	2012-07-21 20:44:20 +0000
@@ -33,6 +33,7 @@
 typedef struct _CCSBackendInterface  CCSBackendInterface;
 
 typedef struct _CCSContext CCSContext;
+typedef struct _CCSPlugin  CCSPlugin;
 typedef struct _CCSSetting CCSSetting;
 
 struct _CCSBackend
@@ -57,6 +58,8 @@
 (CCSBackend *, CCSContext * context, CCSSetting * setting);
 typedef void (*CCSBackendWriteDoneFunc) (CCSBackend *, CCSContext * context);
 
+typedef void (*CCSBackendUpdateFunc) (CCSBackend *, CCSContext *, CCSPlugin *, CCSSetting *);
+
 typedef Bool (*CCSBackendGetSettingIsIntegratedFunc) (CCSBackend *, CCSSetting * setting);
 typedef Bool (*CCSBackendGetSettingIsReadOnlyFunc) (CCSBackend *, CCSSetting * setting);
 
@@ -93,6 +96,7 @@
     CCSBackendWriteSettingFunc writeSetting;
     CCSBackendWriteDoneFunc    writeDone;
 
+    CCSBackendUpdateFunc       updateSetting;
 
     CCSBackendGetSettingIsIntegratedFunc     getSettingIsIntegrated;
     CCSBackendGetSettingIsReadOnlyFunc       getSettingIsReadOnly;
@@ -118,6 +122,7 @@
 Bool ccsBackendWriteInit (CCSBackend *backend, CCSContext *context);
 void ccsBackendWriteSetting (CCSBackend *backend, CCSContext *context, CCSSetting *setting);
 void ccsBackendWriteDone (CCSBackend *backend, CCSContext *context);
+void ccsBackendUpdateSetting (CCSBackend *backend, CCSContext *context, CCSPlugin *plugin, CCSSetting *setting);
 Bool ccsBackendGetSettingIsIntegrated (CCSBackend *backend, CCSSetting *setting);
 Bool ccsBackendGetSettingIsReadOnly (CCSBackend *backend, CCSSetting *setting);
 CCSStringList ccsBackendGetExistingProfiles (CCSBackend *backend, CCSContext *context);
@@ -157,12 +162,18 @@
 
 /* Backend opener method */
 void *
-ccsBackendOpen (char *name, CCSBackendInterface **interface, Bool *fellback);
+ccsOpenBackend (const char *name, CCSBackendInterface **interface, Bool *fellback);
 
 /* Constructor method */
 CCSBackend *
 ccsBackendNewWithInterface (CCSContext *context, const CCSBackendInterface *interface, void *dlhand);
 
+typedef struct _CCSInterfaceTable CCSInterfaceTable;
+
+/* Constructor method */
+CCSBackendWithCapabilities *
+ccsBackendWithCapabilitiesWrapBackend (const CCSInterfaceTable *interfaces, CCSBackend *backend);
+
 CCSBackendInterface* getBackendInfo (void);
 
 COMPIZCONFIG_END_DECLS
 
=== modified file 'compizconfig/libcompizconfig/include/ccs.h'
--- compizconfig/libcompizconfig/include/ccs.h	2012-07-21 20:44:19 +0000
+++ compizconfig/libcompizconfig/include/ccs.h	2012-07-21 20:44:20 +0000
@@ -808,6 +808,10 @@
 CCSSettingColorValue* ccsGetColorArrayFromValueList (CCSSettingValueList list,
 	       					     int                 *num);
 
+/* Copies lists */
+CCSSettingValueList
+ccsCopyList (CCSSettingValueList l1, CCSSetting * setting);
+
 /* Converts an array of data items to a setting value list. Behaves similar
    to ccsGetListFromStringArray */
 CCSSettingValueList ccsGetValueListFromStringArray (const char **array,
 
=== modified file 'compizconfig/libcompizconfig/src/main.c'
--- compizconfig/libcompizconfig/src/main.c	2012-07-21 20:44:19 +0000
+++ compizconfig/libcompizconfig/src/main.c	2012-07-21 20:44:20 +0000
@@ -1014,7 +1014,7 @@
 CCSREF_OBJ (BackendWithCapabilities, CCSBackendWithCapabilities)
 
 static void *
-openBackend (char *backend)
+openBackend (const char *backend)
 {
     char *home = getenv ("HOME");
     char *override_backend = getenv ("LIBCOMPIZCONFIG_BACKEND_PATH");
@@ -1158,7 +1158,7 @@
 }
 
 void *
-ccsOpenBackend (char *name, CCSBackendInterface **vt, Bool *fellback)
+ccsOpenBackend (const char *name, CCSBackendInterface **vt, Bool *fellback)
 {
     void *dlhand = openBackend (name);
     if (!dlhand)
@@ -1378,11 +1378,21 @@
     return (GET_INTERFACE (CCSBackendInterface, backend))->writeDone != NULL;
 }
 
+static Bool ccsBackendHasUpdateSetting (CCSBackend *backend)
+{
+    return (GET_INTERFACE (CCSBackendInterface, backend))->updateSetting != NULL;
+}
+
 void ccsBackendWriteDone (CCSBackend *backend, CCSContext *context)
 {
     return (*(GET_INTERFACE (CCSBackendInterface, backend))->writeDone) (backend, context);
 }
 
+void ccsBackendUpdateSetting (CCSBackend *backend, CCSContext *context, CCSPlugin *plugin, CCSSetting *setting)
+{
+    return (*(GET_INTERFACE (CCSBackendInterface, backend))->updateSetting) (backend, context, plugin, setting);
+}
+
 static Bool ccsBackendHasGetSettingIsIntegrated (CCSBackend *backend)
 {
     return (GET_INTERFACE (CCSBackendInterface, backend))->getSettingIsIntegrated != NULL;
@@ -1556,6 +1566,14 @@
 	ccsBackendWriteDone (bcPrivate->backend, context);
 }
 
+static void ccsBackendCapabilitiesUpdateSettingWrapper (CCSBackend *backend, CCSContext *context, CCSPlugin *plugin, CCSSetting *setting)
+{
+    CAPABILITIES_PRIV (backend);
+
+    if (ccsBackendHasUpdateSetting (bcPrivate->backend))
+	ccsBackendUpdateSetting (bcPrivate->backend, context, plugin, setting);
+}
+
 static Bool ccsBackendCapabilitiesGetSettingIsIntegratedWrapper (CCSBackend *backend, CCSSetting *setting)
 {
     CAPABILITIES_PRIV (backend);
@@ -1614,8 +1632,14 @@
 		return FALSE;
 	    break;
 	case TypeBool:
-	    if (l1->data->value.asBool != l2->data->value.asBool)
-		return FALSE;
+	    {
+		Bool bothTrue = (l1->data->value.asBool && l2->data->value.asBool);
+		Bool bothFalse = (!l1->data->value.asBool && !l2->data->value.asBool);
+
+		/* Use the boolean operators as TRUE/FALSE can be redefined */
+		if (!bothTrue && !bothFalse)
+		    return FALSE;
+	    }
 	    break;
 	case TypeFloat:
 	    if (l1->data->value.asFloat != l2->data->value.asFloat)
@@ -2300,13 +2324,11 @@
     return TRUE;
 }
 
-static CCSSettingValueList
+CCSSettingValueList
 ccsCopyList (CCSSettingValueList l1, CCSSetting * setting)
 {
     CCSSettingValueList l2 = NULL;
 
-    SETTING_PRIV (setting)
-
     while (l1)
     {
 	CCSSettingValue *value = calloc (1, sizeof (CCSSettingValue));
@@ -2317,7 +2339,7 @@
 	value->parent = setting;
 	value->isListChild = TRUE;
 
-	switch (sPrivate->info.forList.listType)
+	switch (ccsSettingGetInfo (setting)->forList.listType)
 	{
 	case TypeInt:
 	    value->value.asInt = l1->data->value.asInt;
@@ -5520,6 +5542,7 @@
     ccsBackendCapabilitiesWriteInitWrapper,
     ccsBackendCapabilitiesWriteSettingWrapper,
     ccsBackendCapabilitiesWriteDoneWrapper,
+    ccsBackendCapabilitiesUpdateSettingWrapper,
     ccsBackendCapabilitiesGetSettingIsIntegratedWrapper,
     ccsBackendCapabilitiesGetSettingIsReadOnlyWrapper,
     ccsBackendCapabilitiesGetExistingProfilesWrapper,
 
=== modified file 'compizconfig/libcompizconfig/tests/compizconfig_test_ccs_mock_backend_conformance.cpp'
--- compizconfig/libcompizconfig/tests/compizconfig_test_ccs_mock_backend_conformance.cpp	2012-07-21 20:44:19 +0000
+++ compizconfig/libcompizconfig/tests/compizconfig_test_ccs_mock_backend_conformance.cpp	2012-07-21 20:44:20 +0000
@@ -15,6 +15,7 @@
 using ::testing::Combine;
 using ::testing::ValuesIn;
 using ::testing::Values;
+using ::testing::AtLeast;
 
 namespace
 {
@@ -49,6 +50,7 @@
 
 	CCSBackend * SetUp (CCSContext *context, CCSContextGMock *gmockContext)
 	{
+	    mContext = context;
 	    mBackend = ccsMockBackendNew ();
 	    mBackendGMock = (CCSBackendGMock *) ccsObjectGetPrivate (mBackend);
 
@@ -59,6 +61,13 @@
 				this,
 				&MockCCSBackendConceptTestEnvironment::ReadValueIntoSetting)));
 
+	    ON_CALL (*mBackendGMock, updateSetting (_, _, _))
+		    .WillByDefault (
+			WithArgs<2> (
+			    Invoke (
+				this,
+				&MockCCSBackendConceptTestEnvironment::ReadValueIntoSetting)));
+
 	    ON_CALL (*mBackendGMock, writeSetting (_, _))
 		    .WillByDefault (
 			WithArgs<1> (
@@ -72,7 +81,6 @@
 	void TearDown (CCSBackend *backend)
 	{
 	    ccsFreeMockBackend (backend);
-
 	}
 
 	void PreWrite (CCSContextGMock *gmockContext,
@@ -83,8 +91,17 @@
 	    EXPECT_CALL (*mBackendGMock, writeSetting (_, _));
 	    EXPECT_CALL (*gmockPlugin, getName ());
 	    EXPECT_CALL (*gmockSetting, getName ());
-	    EXPECT_CALL (*gmockSetting, getType ());
 	    EXPECT_CALL (*gmockSetting, getParent ());
+
+	    if (type == TypeList)
+	    {
+		EXPECT_CALL (*gmockSetting, getType ()).Times (AtLeast (1));
+		EXPECT_CALL (*gmockSetting, getDefaultValue ()).Times (AtLeast (1));
+	    }
+	    else
+	    {
+		EXPECT_CALL (*gmockSetting, getType ());
+	    }
 	}
 
 	void PostWrite (CCSContextGMock *gmockContext,
@@ -180,8 +197,17 @@
 	    EXPECT_CALL (*mBackendGMock, readSetting (_, _));
 	    EXPECT_CALL (*gmockPlugin, getName ());
 	    EXPECT_CALL (*gmockSetting, getName ());
-	    EXPECT_CALL (*gmockSetting, getType ());
 	    EXPECT_CALL (*gmockSetting, getParent ());
+
+	    if (type == TypeList)
+	    {
+		EXPECT_CALL (*gmockSetting, getType ()).Times (AtLeast (1));
+		EXPECT_CALL (*gmockSetting, getInfo ()).Times (AtLeast (1));
+	    }
+	    else
+	    {
+		EXPECT_CALL (*gmockSetting, getType ());
+	    }
 	}
 
 	void PostRead (CCSContextGMock *gmockContext,
@@ -252,11 +278,57 @@
 	}
 
 	virtual CCSSettingValueList ReadListAtKey (const std::string &plugin,
-						   const std::string &key)
+						   const std::string &key,
+						   CCSSettingInfo    *info)
 	{
 	    return *(ValueForKeyRetreival <boost::shared_ptr <CCSListWrapper> > ().GetValueForKey (keynameFromPluginKey (plugin, key), mValues));
 	}
 
+	void PreUpdate (CCSContextGMock *gmockContext,
+		      CCSPluginGMock  *gmockPlugin,
+		      CCSSettingGMock *gmockSetting,
+		      CCSSettingType  type)
+	{
+	    EXPECT_CALL (*mBackendGMock, updateSetting (_, _, _));
+	    EXPECT_CALL (*gmockPlugin, getName ());
+	    EXPECT_CALL (*gmockSetting, getName ());
+	    EXPECT_CALL (*gmockSetting, getParent ());
+
+	    if (type == TypeList)
+	    {
+		EXPECT_CALL (*gmockSetting, getType ()).Times (AtLeast (1));
+		EXPECT_CALL (*gmockSetting, getInfo ()).Times (AtLeast (1));
+	    }
+	    else
+	    {
+		EXPECT_CALL (*gmockSetting, getType ());
+	    }
+	}
+
+	void PostUpdate (CCSContextGMock *gmockContext,
+		       CCSPluginGMock  *gmockPlugin,
+		       CCSSettingGMock *gmockSetting,
+		       CCSSettingType  type)
+	{
+	}
+
+	bool UpdateSettingAtKey (const std::string &plugin,
+				 const std::string &setting)
+	{
+	    CCSPlugin *cplugin = ccsFindPlugin (mContext, plugin.c_str ());
+
+	    if (!cplugin)
+		return false;
+
+	    CCSSetting *csetting = ccsFindSetting (cplugin, setting.c_str ());
+
+	    if (!csetting)
+		return false;
+
+	    ccsBackendUpdateSetting (mBackend, mContext, cplugin, csetting);
+	    return true;
+	}
+
     protected:
 
 	void ReadValueIntoSetting (CCSSetting *setting)
@@ -317,9 +389,12 @@
 		    break;
 
 		case TypeList:
+		{
+		    CCSSettingInfo *info = ccsSettingGetInfo (setting);
 
-		    ccsSetList (setting, ReadListAtKey (plugin, key), FALSE);
-		    break;
+		    ccsSetList (setting, ReadListAtKey (plugin, key, info), FALSE);
+		}
+		break;
 
 		default:
 
@@ -405,11 +480,18 @@
 		    break;
 
 		case TypeList:
+		{
+		    CCSSettingValueList listCopy = NULL;
 
 		    ccsGetList (setting, &vList);
-		    WriteListAtKey (plugin, key, VariantTypes (boost::make_shared <CCSListWrapper> (vList, false, ccsSettingGetInfo (setting)->forList.listType)));
+		    listCopy = ccsCopyList (vList, setting);
+
+		    WriteListAtKey (plugin, key, VariantTypes (boost::make_shared <CCSListWrapper> (listCopy, true,
+												    ccsSettingGetInfo (setting)->forList.listType,
+												    boost::shared_ptr <CCSSettingInfo> (),
+												    boost::shared_ptr <CCSSetting> ())));
 		    break;
-
+		}
 		default:
 
 		    throw std::exception ();
@@ -420,6 +502,7 @@
 
 	CCSBackend *mBackend;
 	CCSBackendGMock *mBackendGMock;
+	CCSContext *mContext;
 	std::map <std::string, VariantTypes> mValues;
 };
 
 
=== modified file 'compizconfig/mocks/libcompizconfig/compizconfig_ccs_backend_mock.cpp'
--- compizconfig/mocks/libcompizconfig/compizconfig_ccs_backend_mock.cpp	2012-07-21 20:44:19 +0000
+++ compizconfig/mocks/libcompizconfig/compizconfig_ccs_backend_mock.cpp	2012-07-21 20:44:20 +0000
@@ -21,6 +21,7 @@
     CCSBackendGMock::ccsBackendWriteInit,
     CCSBackendGMock::ccsBackendWriteSetting,
     CCSBackendGMock::ccsBackendWriteDone,
+    CCSBackendGMock::ccsBackendUpdateSetting,
     CCSBackendGMock::ccsBackendGetSettingIsIntegrated,
     CCSBackendGMock::ccsBackendGetSettingIsReadOnly,
     CCSBackendGMock::ccsBackendGetExistingProfiles,
 
=== modified file 'compizconfig/mocks/libcompizconfig/compizconfig_ccs_backend_mock.h'
--- compizconfig/mocks/libcompizconfig/compizconfig_ccs_backend_mock.h	2012-07-21 20:44:19 +0000
+++ compizconfig/mocks/libcompizconfig/compizconfig_ccs_backend_mock.h	2012-07-21 20:44:20 +0000
@@ -29,6 +29,7 @@
 	virtual Bool writeInit (CCSContext *conxtext) = 0;
 	virtual void writeSetting (CCSContext *context, CCSSetting *setting) = 0;
 	virtual void writeDone (CCSContext *context) = 0;
+	virtual void updateSetting (CCSContext *context, CCSPlugin *plugin, CCSSetting *setting) = 0;
 	virtual Bool getSettingIsIntegrated (CCSSetting *setting) = 0;
 	virtual Bool getSettingIsReadOnly (CCSSetting *setting) = 0;
 	virtual CCSStringList getExistingProfiles (CCSContext *context) = 0;
@@ -62,6 +63,7 @@
 	MOCK_METHOD1 (writeInit, Bool (CCSContext *));
 	MOCK_METHOD2 (writeSetting, void (CCSContext *, CCSSetting *));
 	MOCK_METHOD1 (writeDone, void (CCSContext *));
+	MOCK_METHOD3 (updateSetting, void (CCSContext *, CCSPlugin *, CCSSetting *));
 	MOCK_METHOD1 (getSettingIsIntegrated, Bool (CCSSetting *));
 	MOCK_METHOD1 (getSettingIsReadOnly, Bool (CCSSetting *));
 	MOCK_METHOD1 (getExistingProfiles, CCSStringList (CCSContext *));
@@ -144,6 +146,11 @@
 	    ((CCSBackendGMock *) ccsObjectGetPrivate (backend))->writeDone (context);
 	}
 
+	static void ccsBackendUpdateSetting (CCSBackend *backend, CCSContext *context, CCSPlugin *plugin, CCSSetting *setting)
+	{
+	    ((CCSBackendGMock *) ccsObjectGetPrivate (backend))->updateSetting (context, plugin, setting);
+	}
+
 	static Bool ccsBackendGetSettingIsIntegrated (CCSBackend *backend, CCSSetting *setting)
 	{
 	    return ((CCSBackendGMock *) ccsObjectGetPrivate (backend))->getSettingIsIntegrated (setting);
 
=== modified file 'compizconfig/tests/compizconfig_backend_concept_test.h'
--- compizconfig/tests/compizconfig_backend_concept_test.h	2012-07-21 20:44:19 +0000
+++ compizconfig/tests/compizconfig_backend_concept_test.h	2012-07-21 20:44:20 +0000
@@ -13,6 +13,8 @@
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
 
+#include <X11/keysym.h>
+
 #include <ccs-backend.h>
 #include <ccs.h>
 
@@ -24,10 +26,15 @@
 using ::testing::SetArgPointee;
 using ::testing::DoAll;
 using ::testing::Return;
+using ::testing::ReturnNull;
 using ::testing::MakeMatcher;
 using ::testing::Matcher;
 using ::testing::MatcherInterface;
 using ::testing::MatchResultListener;
+using ::testing::AtLeast;
+
+MATCHER(IsTrue, "Is True") { if (arg) return true; else return false; }
+MATCHER(IsFalse, "Is False") { if (!arg) return true; else return false; }
 
 class ListEqualityMatcher :
     public MatcherInterface <CCSSettingValueList>
@@ -77,6 +84,13 @@
     return false;
 }
 
+::std::ostream &
+operator<< (::std::ostream &os, const CCSSettingColorValue &v)
+{
+    return os << "Red: " << std::hex << v.color.red << "Blue: " << std::hex << v.color.blue << "Green: " << v.color.green << "Alpha: " << v.color.alpha
+       << std::dec << std::endl;
+}
+
 bool
 operator== (const CCSSettingKeyValue &lhs,
 	    const CCSSettingKeyValue &rhs)
@@ -86,6 +100,12 @@
     return false;
 }
 
+::std::ostream &
+operator<< (::std::ostream &os, const CCSSettingKeyValue &v)
+{
+    return os << "Keysym: " << v.keysym << " KeyModMask " << std::hex << v.keyModMask << std::dec << std::endl;
+}
+
 bool
 operator== (const CCSSettingButtonValue &lhs,
 	    const CCSSettingButtonValue &rhs)
@@ -95,6 +115,42 @@
     return false;
 }
 
+::std::ostream &
+operator<< (::std::ostream &os, const CCSSettingButtonValue &v)
+{
+    return os << "Button " << v.button << "Button Key Mask: " << std::hex << v.buttonModMask << "Edge Mask: " << v.edgeMask << std::dec << std::endl;
+}
+
+class CharacterWrapper :
+    boost::noncopyable
+{
+    public:
+
+	explicit CharacterWrapper (char *c) :
+	    mChar (c)
+	{
+	}
+
+	~CharacterWrapper ()
+	{
+	    free (mChar);
+	}
+
+	operator char * ()
+	{
+	    return mChar;
+	}
+
+	operator const char * () const
+	{
+	    return mChar;
+	}
+
+    private:
+
+	char *mChar;
+};
+
 class CCSListWrapper :
     boost::noncopyable
 {
@@ -102,10 +158,16 @@
 
 	typedef boost::shared_ptr <CCSListWrapper> Ptr;
 
-	CCSListWrapper (CCSSettingValueList list, bool freeItems, CCSSettingType type) :
+	CCSListWrapper (CCSSettingValueList list,
+			bool freeItems,
+			CCSSettingType type,
+			const boost::shared_ptr <CCSSettingInfo> &listInfo,
+			const boost::shared_ptr <CCSSetting> &settingReference) :
 	    mList (list),
 	    mFreeItems (freeItems),
-	    mType (type)
+	    mType (type),
+	    mListInfo (listInfo),
+	    mSettingReference (settingReference)
 	{
 	}
 
@@ -130,6 +192,8 @@
 	CCSSettingValueList mList;
 	bool		    mFreeItems;
 	CCSSettingType      mType;
+	boost::shared_ptr <CCSSettingInfo> mListInfo;
+	boost::shared_ptr <CCSSetting> mSettingReference;
 };
 
 typedef boost::variant <bool,
@@ -146,6 +210,8 @@
 {
     public:
 
+	typedef boost::shared_ptr <CCSBackendConceptTestEnvironmentInterface> Ptr;
+
 	virtual ~CCSBackendConceptTestEnvironmentInterface () {};
 	virtual CCSBackend * SetUp (CCSContext *context,
 				    CCSContextGMock *gmockContext) = 0;
@@ -224,7 +290,42 @@
 	virtual Bool ReadBellAtKey (const std::string &plugin,
 				       const std::string &key) = 0;
 	virtual CCSSettingValueList ReadListAtKey (const std::string &plugin,
-				     const std::string &key) = 0;
+				     const std::string &key,
+						    CCSSettingInfo *info) = 0;
+
+	virtual void PreUpdate (CCSContextGMock *,
+			      CCSPluginGMock  *,
+			      CCSSettingGMock *,
+			      CCSSettingType) = 0;
+	virtual void PostUpdate (CCSContextGMock *,
+			       CCSPluginGMock  *,
+			       CCSSettingGMock *,
+			       CCSSettingType) = 0;
+
+	virtual bool UpdateSettingAtKey (const std::string &plugin,
+					 const std::string &setting) = 0;
+};
+
+class CCSBackendConceptTestEnvironmentFactoryInterface
+{
+    public:
+
+	virtual ~CCSBackendConceptTestEnvironmentFactoryInterface () {}
+
+	virtual CCSBackendConceptTestEnvironmentInterface::Ptr ConstructTestEnv () = 0;
+};
+
+template <typename I>
+class CCSBackendConceptTestEnvironmentFactory :
+    public CCSBackendConceptTestEnvironmentFactoryInterface
+{
+    public:
+
+	CCSBackendConceptTestEnvironmentInterface::Ptr
+	ConstructTestEnv ()
+	{
+	    return boost::shared_static_cast <I> (boost::make_shared <I> ());
+	}
 };
 
 namespace
@@ -241,7 +342,7 @@
 			     const VariantTypes &value,
 			     CCSSetting       *setting,
 			     const WriteFunc &write,
-			     CCSBackendConceptTestEnvironmentInterface *env)
+			     const CCSBackendConceptTestEnvironmentInterface::Ptr &env)
 {
     CCSSettingGMock *gmock (getSettingGMockFromSetting (setting));
     EXPECT_CALL (*gmock, getInt (_)).WillRepeatedly (DoAll (
@@ -257,7 +358,7 @@
 			      const VariantTypes &value,
 			      CCSSetting       *setting,
 			      const WriteFunc &write,
-			      CCSBackendConceptTestEnvironmentInterface *env)
+			      const CCSBackendConceptTestEnvironmentInterface::Ptr &env)
 {
     CCSSettingGMock *gmock (getSettingGMockFromSetting (setting));
     EXPECT_CALL (*gmock, getBool (_)).WillRepeatedly (DoAll (
@@ -265,7 +366,13 @@
 							     boolToBool (boost::get <bool> (value))),
 							 Return (TRUE)));
     write ();
-    EXPECT_EQ (env->ReadBoolAtKey (plugin, key), boolToBool (boost::get <bool> (value)));
+
+    bool v (boost::get <bool> (value));
+
+    if (v)
+	EXPECT_THAT (env->ReadBoolAtKey (plugin, key), IsTrue ());
+    else
+	EXPECT_THAT (env->ReadBoolAtKey (plugin, key), IsFalse ());
 }
 
 void SetFloatWriteExpectation (const std::string &plugin,
@@ -273,7 +380,7 @@
 			       const VariantTypes &value,
 			       CCSSetting       *setting,
 			       const WriteFunc &write,
-			       CCSBackendConceptTestEnvironmentInterface *env)
+			       const CCSBackendConceptTestEnvironmentInterface::Ptr &env)
 {
     CCSSettingGMock *gmock (getSettingGMockFromSetting (setting));
     EXPECT_CALL (*gmock, getFloat (_)).WillRepeatedly (DoAll (
@@ -289,7 +396,7 @@
 				const VariantTypes &value,
 				CCSSetting       *setting,
 				const WriteFunc &write,
-				CCSBackendConceptTestEnvironmentInterface *env)
+				const CCSBackendConceptTestEnvironmentInterface::Ptr &env)
 {
     CCSSettingGMock *gmock (getSettingGMockFromSetting (setting));
     EXPECT_CALL (*gmock, getString (_)).WillRepeatedly (DoAll (
@@ -297,7 +404,7 @@
 							     const_cast <char *> (boost::get <const char *> (value))),
 							 Return (TRUE)));
     write ();
-    EXPECT_EQ (env->ReadStringAtKey (plugin, key), boost::get <const char *> (value));
+    EXPECT_EQ (std::string (env->ReadStringAtKey (plugin, key)), std::string (boost::get <const char *> (value)));
 }
 
 void SetColorWriteExpectation (const std::string &plugin,
@@ -305,7 +412,7 @@
 			       const VariantTypes &value,
 			       CCSSetting       *setting,
 			       const WriteFunc &write,
-			       CCSBackendConceptTestEnvironmentInterface *env)
+			       const CCSBackendConceptTestEnvironmentInterface::Ptr &env)
 {
     CCSSettingGMock *gmock (getSettingGMockFromSetting (setting));
     EXPECT_CALL (*gmock, getColor (_)).WillRepeatedly (DoAll (
@@ -313,6 +420,7 @@
 							     boost::get <CCSSettingColorValue> (value)),
 							 Return (TRUE)));
     write ();
+
     EXPECT_EQ (env->ReadColorAtKey (plugin, key), boost::get <CCSSettingColorValue> (value));
 }
 
@@ -321,7 +429,7 @@
 			     const VariantTypes &value,
 			     CCSSetting       *setting,
 			     const WriteFunc &write,
-			     CCSBackendConceptTestEnvironmentInterface *env)
+			     const CCSBackendConceptTestEnvironmentInterface::Ptr &env)
 {
     CCSSettingGMock *gmock (getSettingGMockFromSetting (setting));
     EXPECT_CALL (*gmock, getKey (_)).WillRepeatedly (DoAll (
@@ -337,7 +445,7 @@
 				const VariantTypes &value,
 				CCSSetting       *setting,
 				const WriteFunc &write,
-				CCSBackendConceptTestEnvironmentInterface *env)
+				const CCSBackendConceptTestEnvironmentInterface::Ptr &env)
 {
     CCSSettingGMock *gmock (getSettingGMockFromSetting (setting));
     EXPECT_CALL (*gmock, getButton (_)).WillRepeatedly (DoAll (
@@ -353,7 +461,7 @@
 			      const VariantTypes &value,
 			      CCSSetting       *setting,
 			      const WriteFunc &write,
-			      CCSBackendConceptTestEnvironmentInterface *env)
+			      const CCSBackendConceptTestEnvironmentInterface::Ptr &env)
 {
     CCSSettingGMock *gmock (getSettingGMockFromSetting (setting));
     EXPECT_CALL (*gmock, getEdge (_)).WillRepeatedly (DoAll (
@@ -369,7 +477,7 @@
 			      const VariantTypes &value,
 			      CCSSetting       *setting,
 			      const WriteFunc &write,
-			      CCSBackendConceptTestEnvironmentInterface *env)
+			      const CCSBackendConceptTestEnvironmentInterface::Ptr &env)
 {
     CCSSettingGMock *gmock (getSettingGMockFromSetting (setting));
     EXPECT_CALL (*gmock, getBell (_)).WillRepeatedly (DoAll (
@@ -377,7 +485,12 @@
 							     boolToBool (boost::get <bool> (value))),
 							 Return (TRUE)));
     write ();
-    EXPECT_EQ (env->ReadBellAtKey (plugin, key), boolToBool (boost::get <bool> (value)));
+    bool v (boost::get <bool> (value));
+
+    if (v)
+	EXPECT_THAT (env->ReadBellAtKey (plugin, key), IsTrue ());
+    else
+	EXPECT_THAT (env->ReadBellAtKey (plugin, key), IsFalse ());
 }
 
 void SetMatchWriteExpectation (const std::string &plugin,
@@ -385,7 +498,7 @@
 			       const VariantTypes &value,
 			       CCSSetting       *setting,
 			       const WriteFunc &write,
-			       CCSBackendConceptTestEnvironmentInterface *env)
+			       const CCSBackendConceptTestEnvironmentInterface::Ptr &env)
 {
     CCSSettingGMock *gmock (getSettingGMockFromSetting (setting));
     EXPECT_CALL (*gmock, getMatch (_)).WillRepeatedly (DoAll (
@@ -393,7 +506,7 @@
 							     const_cast <char *> (boost::get <const char *> (value))),
 							 Return (TRUE)));
     write ();
-    EXPECT_EQ (env->ReadMatchAtKey (plugin, key), boost::get <const char *> (value));
+    EXPECT_EQ (std::string (env->ReadMatchAtKey (plugin, key)), std::string (boost::get <const char *> (value)));
 }
 
 void SetListWriteExpectation (const std::string &plugin,
@@ -401,21 +514,24 @@
 			      const VariantTypes &value,
 			      CCSSetting       *setting,
 			      const WriteFunc &write,
-			      CCSBackendConceptTestEnvironmentInterface *env)
+			      const CCSBackendConceptTestEnvironmentInterface::Ptr &env)
 {
     CCSSettingGMock *gmock (getSettingGMockFromSetting (setting));
     CCSSettingValueList list = *(boost::get <boost::shared_ptr <CCSListWrapper> > (value));
-    boost::shared_ptr <CCSSettingInfo> info (boost::make_shared <CCSSettingInfo> ());
+
+    EXPECT_CALL (*gmock, getInfo ());
+
+    CCSSettingInfo      *info = ccsSettingGetInfo (setting);
 
     info->forList.listType = (boost::get <boost::shared_ptr <CCSListWrapper> > (value))->type ();
 
-    EXPECT_CALL (*gmock, getInfo ()).WillRepeatedly (Return (info.get ()));
+    EXPECT_CALL (*gmock, getInfo ()).Times (AtLeast (1));
     EXPECT_CALL (*gmock, getList (_)).WillRepeatedly (DoAll (
 							 SetArgPointee <0> (
 							     list),
 							 Return (TRUE)));
     write ();
-    EXPECT_THAT (env->ReadListAtKey (plugin, key), ListEqual (ccsSettingGetInfo (setting)->forList, list));
+    EXPECT_THAT (env->ReadListAtKey (plugin, key, info), ListEqual (ccsSettingGetInfo (setting)->forList, list));
 }
 
 void SetIntReadExpectation (CCSSettingGMock *gmock, const VariantTypes &value)
@@ -425,12 +541,22 @@
 
 void SetBoolReadExpectation (CCSSettingGMock *gmock, const VariantTypes &value)
 {
-    EXPECT_CALL (*gmock, setBool (boolToBool (boost::get <bool> (value)), _));
+    bool v (boost::get <bool> (value));
+
+    if (v)
+	EXPECT_CALL (*gmock, setBool (IsTrue (), _));
+    else
+	EXPECT_CALL (*gmock, setBool (IsFalse (), _));
 }
 
 void SetBellReadExpectation (CCSSettingGMock *gmock, const VariantTypes &value)
 {
-    EXPECT_CALL (*gmock, setBell (boolToBool (boost::get <bool> (value)), _));
+    bool v (boost::get <bool> (value));
+
+    if (v)
+	EXPECT_CALL (*gmock, setBell (IsTrue (), _));
+    else
+	EXPECT_CALL (*gmock, setBell (IsFalse (), _));
 }
 
 void SetFloatReadExpectation (CCSSettingGMock *gmock, const VariantTypes &value)
@@ -468,14 +594,15 @@
     EXPECT_CALL (*gmock, setEdge (boost::get <unsigned int> (value), _));
 }
 
+CCSSettingInfo globalListInfo;
+
 void SetListReadExpectation (CCSSettingGMock *gmock, const VariantTypes &value)
 {
-    CCSSettingInfo info;
-
-    info.forList.listType = (boost::get <boost::shared_ptr <CCSListWrapper> > (value))->type ();
-    info.forList.listInfo = NULL;
-
-    EXPECT_CALL (*gmock, setList (ListEqual (info.forList, *(boost::get <boost::shared_ptr <CCSListWrapper> > (value))), _));
+    globalListInfo.forList.listType = (boost::get <boost::shared_ptr <CCSListWrapper> > (value))->type ();
+    globalListInfo.forList.listInfo = NULL;
+
+    ON_CALL (*gmock, getInfo ()).WillByDefault (Return (&globalListInfo));
+    EXPECT_CALL (*gmock, setList (ListEqual (globalListInfo.forList, *(boost::get <boost::shared_ptr <CCSListWrapper> > (value))), _));
 }
 
 }
@@ -486,9 +613,10 @@
 
 	typedef boost::shared_ptr <CCSBackendConceptTestParamInterface> Ptr;
 
-	typedef boost::function <void (const std::string &plugin,
-				       const std::string &keyname,
-				       const VariantTypes &value)> NativeWriteMethod;
+	typedef void (CCSBackendConceptTestEnvironmentInterface::*NativeWriteMethod) (const std::string &plugin,
+										      const std::string &keyname,
+										      const VariantTypes &value);
+
 	typedef boost::function <void (CCSSettingGMock *,
 				       const VariantTypes &)> SetReadExpectation;
 	typedef boost::function <void (const std::string &,
@@ -496,11 +624,16 @@
 				       const VariantTypes &,
 				       CCSSetting        *,
 				       const WriteFunc &,
-				       CCSBackendConceptTestEnvironmentInterface *)> SetWriteExpectation;
-
-	virtual CCSBackendConceptTestEnvironmentInterface * testEnv () = 0;
+				       const CCSBackendConceptTestEnvironmentInterface::Ptr & )> SetWriteExpectation;
+
+	virtual void TearDown (CCSBackend *) = 0;
+
+	virtual CCSBackendConceptTestEnvironmentInterface::Ptr testEnv () = 0;
 	virtual VariantTypes & value () = 0;
-	virtual NativeWriteMethod & nativeWrite () = 0;
+	virtual void nativeWrite (const CCSBackendConceptTestEnvironmentInterface::Ptr &  iface,
+				  const std::string &plugin,
+				  const std::string &keyname,
+				  const VariantTypes &value) = 0;
 	virtual CCSSettingType & type () = 0;
 	virtual std::string & keyname () = 0;
 	virtual SetWriteExpectation & setWriteExpectationAndWrite () = 0;
@@ -516,7 +649,7 @@
 
 	typedef boost::shared_ptr <CCSBackendConceptTestParam <I> > Ptr;
 
-	CCSBackendConceptTestParam (CCSBackendConceptTestEnvironmentInterface *testEnv,
+	CCSBackendConceptTestParam (CCSBackendConceptTestEnvironmentFactoryInterface *testEnvFactory,
 				    const VariantTypes &value,
 				    const NativeWriteMethod &write,
 				    const CCSSettingType &type,
@@ -524,7 +657,8 @@
 				    const SetReadExpectation &setReadExpectation,
 				    const SetWriteExpectation &setWriteExpectation,
 				    const std::string &what) :
-	    mTestEnv (testEnv),
+	    mTestEnvFactory (testEnvFactory),
+	    mTestEnv (),
 	    mValue (value),
 	    mNativeWrite (write),
 	    mType (type),
@@ -535,9 +669,30 @@
 	{
 	}
 
-	CCSBackendConceptTestEnvironmentInterface * testEnv () { return mTestEnv; }
+	void TearDown (CCSBackend *b)
+	{
+	    if (mTestEnv)
+		mTestEnv->TearDown (b);
+
+	    mTestEnv.reset ();
+	}
+
+	CCSBackendConceptTestEnvironmentInterface::Ptr testEnv ()
+	{
+	    if (!mTestEnv)
+		mTestEnv = mTestEnvFactory->ConstructTestEnv ();
+
+	    return mTestEnv;
+	}
+
 	VariantTypes & value () { return mValue; }
-	CCSBackendConceptTestParamInterface::NativeWriteMethod & nativeWrite () { return mNativeWrite; }
+	void nativeWrite (const CCSBackendConceptTestEnvironmentInterface::Ptr &  iface,
+			  const std::string &plugin,
+			  const std::string &keyname,
+			  const VariantTypes &value)
+	{
+	    return ((iface.get ())->*mNativeWrite) (plugin, keyname, value);
+	}
 	CCSSettingType & type () { return mType; }
 	std::string & keyname () { return mKeyname; }
 	CCSBackendConceptTestParamInterface::SetReadExpectation & setReadExpectation () { return mSetReadExpectation; }
@@ -546,7 +701,8 @@
 
     private:
 
-	CCSBackendConceptTestEnvironmentInterface *mTestEnv;
+	CCSBackendConceptTestEnvironmentFactoryInterface *mTestEnvFactory;
+	CCSBackendConceptTestEnvironmentInterface::Ptr mTestEnv;
 	VariantTypes mValue;
 	NativeWriteMethod mNativeWrite;
 	CCSSettingType mType;
@@ -586,7 +742,7 @@
 
 	virtual void TearDown ()
 	{
-	    CCSBackendConformanceTest::GetParam ()->testEnv ()->TearDown (mBackend);
+	    CCSBackendConformanceTest::GetParam ()->TearDown (mBackend);
 
 	    for (std::list <CCSContext *>::iterator it = mSpawnedContexts.begin ();
 		 it != mSpawnedContexts.end ();
@@ -640,6 +796,7 @@
 	{
 	    *setting = ccsMockSettingNew ();
 	    mSpawnedSettings.push_back (*setting);
+	    mSpawnedSettingInfo.push_back (CCSSettingInfo ());
 
 	    CCSSettingGMock *gmockSetting = (CCSSettingGMock *) ccsObjectGetPrivate (*setting);
 
@@ -650,6 +807,7 @@
 	    ON_CALL (*gmockSetting, getName ()).WillByDefault (Return ((char *) name.c_str ()));
 	    ON_CALL (*gmockSetting, getType ()).WillByDefault (Return (type));
 	    ON_CALL (*gmockSetting, getParent ()).WillByDefault (Return (plugin));
+	    ON_CALL (*gmockSetting, getInfo ()).WillByDefault (Return (&(mSpawnedSettingInfo.back ())));
 	}
 
     protected:
@@ -662,6 +820,7 @@
 	std::list <CCSContext *> mSpawnedContexts;
 	std::list <CCSPlugin  *> mSpawnedPlugins;
 	std::list <CCSSetting *> mSpawnedSettings;
+	std::vector <CCSSettingInfo> mSpawnedSettingInfo;
 
 	CCSBackend *mBackend;
 
@@ -680,155 +839,209 @@
 float floatValues[] = { 1.0, 2.0, 3.0 };
 const char * stringValues[] = { "foo", "grill", "bar" };
 
-CCSSettingColorValue colorValues[3] = { { .color = { 100, 200, 300, 100 } },
-					{ .color = { 50, 100, 200, 300 } },
-					{ .color = { 10, 20, 30, 40 } }
-				      };
-
-CCSSettingKeyValue keyValue = { (1 << 0) | (1 << 1),
-				1 };
-
-CCSSettingButtonValue buttonValue = { (1 << 0) | (1 << 1),
-				      1,
+const unsigned int NUM_COLOR_VALUES = 3;
+
+CCSSettingColorValue *
+getColorValueList ()
+{
+    static const unsigned short max = std::numeric_limits <unsigned short>::max ();
+    static const unsigned short maxD2 = max / 2;
+    static const unsigned short maxD4 = max / 4;
+    static const unsigned short maxD8 = max / 8;
+
+    static CCSSettingColorValue colorValues[NUM_COLOR_VALUES] = { { .color = { maxD2, maxD4, maxD8, max } },
+								  { .color = { maxD8, maxD4, maxD2, max } },
+								  { .color = { max, maxD4, maxD2, maxD8 } }
+								};
+    static bool colorValueListInitialized = false;
+
+    if (!colorValueListInitialized)
+    {
+	for (unsigned int i = 0; i < NUM_COLOR_VALUES; i++)
+	{
+	    CharacterWrapper s (ccsColorToString (&colorValues[i]));
+
+	    ccsStringToColor (s, &colorValues[i]);
+	}
+
+	colorValueListInitialized = true;
+    }
+
+    return colorValues;
+}
+
+CCSSettingKeyValue keyValue = { XK_A,
+				(1 << 0)};
+
+CCSSettingButtonValue buttonValue = { 1,
+				      (1 << 0),
 				      (1 << 1) };
+
+}
+
+typedef boost::function <CCSSettingValueList (CCSSetting *)> ConstructorFunc;
+
+CCSListWrapper::Ptr
+CCSListConstructionExpectationsSetter (const ConstructorFunc &c,
+				       CCSSettingType        type,
+				       bool                  freeItems)
+{
+    boost::function <void (CCSSetting *)> f (boost::bind (ccsFreeMockSetting, _1));
+    boost::shared_ptr <CCSSetting> mockSetting (ccsMockSettingNew (), f);
+    CCSSettingGMock                *gmockSetting = reinterpret_cast <CCSSettingGMock *> (ccsObjectGetPrivate (mockSetting.get ()));
+
+    EXPECT_CALL (*gmockSetting, getType ()).WillRepeatedly (Return (TypeList));
+
+    boost::shared_ptr <CCSSettingInfo> listInfo (new CCSSettingInfo);
+
+    listInfo->forList.listType = type;
+
+    EXPECT_CALL (*gmockSetting, getInfo ()).WillRepeatedly (Return (listInfo.get ()));
+    EXPECT_CALL (*gmockSetting, getDefaultValue ()).WillRepeatedly (ReturnNull ());
+    return boost::make_shared <CCSListWrapper> (c (mockSetting.get ()), freeItems, type, listInfo, mockSetting);
 }
 
 template <typename I>
 ::testing::internal::ParamGenerator<typename CCSBackendConceptTestParamInterface::Ptr>
 GenerateTestingParametersForBackendInterface ()
 {
-    static I interface;
-    static CCSBackendConceptTestEnvironmentInterface *backendEnv = &interface;
+    static CCSBackendConceptTestEnvironmentFactory <I> interfaceFactory;
+    static CCSBackendConceptTestEnvironmentFactoryInterface *backendEnvFactory = &interfaceFactory;
 
     typedef CCSBackendConceptTestParam<I> ConceptParam;
 
     static typename CCSBackendConceptTestParamInterface::Ptr testParam[] =
     {
-	boost::make_shared <ConceptParam> (backendEnv,
+	boost::make_shared <ConceptParam> (backendEnvFactory,
 					   VariantTypes (1),
-					   boost::bind (&CCSBackendConceptTestEnvironmentInterface::WriteIntegerAtKey, backendEnv, _1, _2, _3),
+					   &CCSBackendConceptTestEnvironmentInterface::WriteIntegerAtKey,
 					   TypeInt,
 					   "integer_setting",
 					   boost::bind (SetIntReadExpectation, _1, _2),
 					   boost::bind (SetIntWriteExpectation, _1, _2, _3, _4, _5, _6),
 					   "TestInt"),
-	boost::make_shared <ConceptParam> (backendEnv,
+	boost::make_shared <ConceptParam> (backendEnvFactory,
 					   VariantTypes (true),
-					   boost::bind (&CCSBackendConceptTestEnvironmentInterface::WriteBoolAtKey, backendEnv, _1, _2, _3),
+					   &CCSBackendConceptTestEnvironmentInterface::WriteBoolAtKey,
 					   TypeBool,
 					   "boolean_setting",
 					   boost::bind (SetBoolReadExpectation, _1, _2),
 					   boost::bind (SetBoolWriteExpectation, _1, _2, _3, _4, _5, _6),
 					   "TestBool"),
-	boost::make_shared <ConceptParam> (backendEnv,
+	boost::make_shared <ConceptParam> (backendEnvFactory,
 					   VariantTypes (static_cast <float> (3.0)),
-					   boost::bind (&CCSBackendConceptTestEnvironmentInterface::WriteFloatAtKey, backendEnv, _1, _2, _3),
+					   &CCSBackendConceptTestEnvironmentInterface::WriteFloatAtKey,
 					   TypeFloat,
 					   "float_setting",
 					   boost::bind (SetFloatReadExpectation, _1, _2),
 					   boost::bind (SetFloatWriteExpectation, _1, _2, _3, _4, _5, _6),
 					   "TestFloat"),
-	boost::make_shared <ConceptParam> (backendEnv,
+	boost::make_shared <ConceptParam> (backendEnvFactory,
 					   VariantTypes (static_cast <const char *> ("foo")),
-					   boost::bind (&CCSBackendConceptTestEnvironmentInterface::WriteStringAtKey, backendEnv, _1, _2, _3),
+					   &CCSBackendConceptTestEnvironmentInterface::WriteStringAtKey,
 					   TypeString,
 					   "string_setting",
 					   boost::bind (SetStringReadExpectation, _1, _2),
 					   boost::bind (SetStringWriteExpectation, _1, _2, _3, _4, _5, _6),
 					   "TestString"),
-	boost::make_shared <ConceptParam> (backendEnv,
+	boost::make_shared <ConceptParam> (backendEnvFactory,
 					   VariantTypes (static_cast <const char *> ("foo=bar")),
-					   boost::bind (&CCSBackendConceptTestEnvironmentInterface::WriteMatchAtKey, backendEnv, _1, _2, _3),
+					   &CCSBackendConceptTestEnvironmentInterface::WriteMatchAtKey,
 					   TypeMatch,
 					   "match_setting",
 					   boost::bind (SetMatchReadExpectation, _1, _2),
 					   boost::bind (SetMatchWriteExpectation, _1, _2, _3, _4, _5, _6),
 					   "TestMatch"),
-	boost::make_shared <ConceptParam> (backendEnv,
+	boost::make_shared <ConceptParam> (backendEnvFactory,
 					   VariantTypes (true),
-					   boost::bind (&CCSBackendConceptTestEnvironmentInterface::WriteBellAtKey, backendEnv, _1, _2, _3),
+					   &CCSBackendConceptTestEnvironmentInterface::WriteBellAtKey,
 					   TypeBell,
 					   "bell_setting",
 					   boost::bind (SetBellReadExpectation, _1, _2),
 					   boost::bind (SetBellWriteExpectation, _1, _2, _3, _4, _5, _6),
 					   "TestBell"),
-	boost::make_shared <ConceptParam> (backendEnv,
-					   VariantTypes (impl::colorValues[0]),
-					   boost::bind (&CCSBackendConceptTestEnvironmentInterface::WriteColorAtKey, backendEnv, _1, _2, _3),
+	boost::make_shared <ConceptParam> (backendEnvFactory,
+					   VariantTypes (impl::getColorValueList ()[0]),
+					   &CCSBackendConceptTestEnvironmentInterface::WriteColorAtKey,
 					   TypeColor,
 					   "color_setting",
 					   boost::bind (SetColorReadExpectation, _1, _2),
 					   boost::bind (SetColorWriteExpectation, _1, _2, _3, _4, _5, _6),
 					   "TestColor"),
-	boost::make_shared <ConceptParam> (backendEnv,
+	boost::make_shared <ConceptParam> (backendEnvFactory,
 					   VariantTypes (impl::keyValue),
-					   boost::bind (&CCSBackendConceptTestEnvironmentInterface::WriteKeyAtKey, backendEnv, _1, _2, _3),
+					   &CCSBackendConceptTestEnvironmentInterface::WriteKeyAtKey,
 					   TypeKey,
 					   "key_setting",
 					   boost::bind (SetKeyReadExpectation, _1, _2),
 					   boost::bind (SetKeyWriteExpectation, _1, _2, _3, _4, _5, _6),
 					   "TestKey"),
-	boost::make_shared <ConceptParam> (backendEnv,
+	boost::make_shared <ConceptParam> (backendEnvFactory,
 					   VariantTypes (impl::buttonValue),
-					   boost::bind (&CCSBackendConceptTestEnvironmentInterface::WriteButtonAtKey, backendEnv, _1, _2, _3),
+					   &CCSBackendConceptTestEnvironmentInterface::WriteButtonAtKey,
 					   TypeButton,
 					   "button_setting",
 					   boost::bind (SetButtonReadExpectation, _1, _2),
 					   boost::bind (SetButtonWriteExpectation, _1, _2, _3, _4, _5, _6),
 					   "TestButton"),
-	boost::make_shared <ConceptParam> (backendEnv,
+	boost::make_shared <ConceptParam> (backendEnvFactory,
 					   VariantTypes (static_cast <unsigned int> (1)),
-					   boost::bind (&CCSBackendConceptTestEnvironmentInterface::WriteEdgeAtKey, backendEnv, _1, _2, _3),
+					   &CCSBackendConceptTestEnvironmentInterface::WriteEdgeAtKey,
 					   TypeEdge,
 					   "edge_setting",
 					   boost::bind (SetEdgeReadExpectation, _1, _2),
 					   boost::bind (SetEdgeWriteExpectation, _1, _2, _3, _4, _5, _6),
 					   "TestEdge"),
-	boost::make_shared <ConceptParam> (backendEnv,
-					   VariantTypes (boost::make_shared <CCSListWrapper> (ccsGetValueListFromIntArray (impl::intValues,
-															   sizeof (impl::intValues) / sizeof (impl::intValues[0]),
-															   NULL), false, TypeInt)),
-					   boost::bind (&CCSBackendConceptTestEnvironmentInterface::WriteListAtKey, backendEnv, _1, _2, _3),
+	boost::make_shared <ConceptParam> (backendEnvFactory,
+					   VariantTypes (CCSListConstructionExpectationsSetter (boost::bind (ccsGetValueListFromIntArray,
+													     impl::intValues,
+													     sizeof (impl::intValues) / sizeof (impl::intValues[0]), _1),
+												TypeInt, true)),
+					   &CCSBackendConceptTestEnvironmentInterface::WriteListAtKey,
 					   TypeList,
 					   "int_list_setting",
 					   boost::bind (SetListReadExpectation, _1, _2),
 					   boost::bind (SetListWriteExpectation, _1, _2, _3, _4, _5, _6),
 					   "TestListInt"),
-	boost::make_shared <ConceptParam> (backendEnv,
-					   VariantTypes (boost::make_shared <CCSListWrapper> (ccsGetValueListFromFloatArray (impl::floatValues,
-															     sizeof (impl::floatValues) / sizeof (impl::floatValues[0]),
-															     NULL), false, TypeFloat)),
-					   boost::bind (&CCSBackendConceptTestEnvironmentInterface::WriteListAtKey, backendEnv, _1, _2, _3),
+	boost::make_shared <ConceptParam> (backendEnvFactory,
+					   VariantTypes (CCSListConstructionExpectationsSetter (boost::bind (ccsGetValueListFromFloatArray,
+													     impl::floatValues,
+													     sizeof (impl::floatValues) / sizeof (impl::floatValues[0]), _1),
+												TypeFloat, true)),
+					   &CCSBackendConceptTestEnvironmentInterface::WriteListAtKey,
 					   TypeList,
 					   "float_list_setting",
 					   boost::bind (SetListReadExpectation, _1, _2),
 					   boost::bind (SetListWriteExpectation, _1, _2, _3, _4, _5, _6),
-					   "TestListInt"),
-	boost::make_shared <ConceptParam> (backendEnv,
-					   VariantTypes (boost::make_shared <CCSListWrapper> (ccsGetValueListFromBoolArray (impl::boolValues,
-															   sizeof (impl::boolValues) / sizeof (impl::boolValues[0]),
-															   NULL), false, TypeBool)),
-					   boost::bind (&CCSBackendConceptTestEnvironmentInterface::WriteListAtKey, backendEnv, _1, _2, _3),
+					   "TestListFloat"),
+	boost::make_shared <ConceptParam> (backendEnvFactory,
+					   VariantTypes (CCSListConstructionExpectationsSetter (boost::bind (ccsGetValueListFromBoolArray,
+													     impl::boolValues,
+													     sizeof (impl::boolValues) / sizeof (impl::boolValues[0]), _1),
+												TypeBool, true)),
+					   &CCSBackendConceptTestEnvironmentInterface::WriteListAtKey,
 					   TypeList,
 					   "bool_list_setting",
 					   boost::bind (SetListReadExpectation, _1, _2),
 					   boost::bind (SetListWriteExpectation, _1, _2, _3, _4, _5, _6),
 					   "TestListBool"),
-	boost::make_shared <ConceptParam> (backendEnv,
-					   VariantTypes (boost::make_shared <CCSListWrapper> (ccsGetValueListFromStringArray (impl::stringValues,
-															      sizeof (impl::stringValues) / sizeof (impl::stringValues[0]),
-															      NULL), false, TypeString)),
-					   boost::bind (&CCSBackendConceptTestEnvironmentInterface::WriteListAtKey, backendEnv, _1, _2, _3),
+	boost::make_shared <ConceptParam> (backendEnvFactory,
+					   VariantTypes (CCSListConstructionExpectationsSetter (boost::bind (ccsGetValueListFromStringArray,
+													     impl::stringValues,
+													     sizeof (impl::stringValues) / sizeof (impl::stringValues[0]), _1),
+												TypeString, true)),
+					   &CCSBackendConceptTestEnvironmentInterface::WriteListAtKey,
 					   TypeList,
 					   "string_list_setting",
 					   boost::bind (SetListReadExpectation, _1, _2),
 					   boost::bind (SetListWriteExpectation, _1, _2, _3, _4, _5, _6),
 					   "TestListString"),
-	boost::make_shared <ConceptParam> (backendEnv,
-					   VariantTypes (boost::make_shared <CCSListWrapper> (ccsGetValueListFromColorArray (impl::colorValues,
-															     sizeof (impl::colorValues) / sizeof (impl::colorValues[0]),
-															     NULL), false, TypeColor)),
-					   boost::bind (&CCSBackendConceptTestEnvironmentInterface::WriteListAtKey, backendEnv, _1, _2, _3),
+	boost::make_shared <ConceptParam> (backendEnvFactory,
+					   VariantTypes (CCSListConstructionExpectationsSetter (boost::bind (ccsGetValueListFromColorArray,
+													     impl::getColorValueList (),
+													     impl::NUM_COLOR_VALUES, _1),
+											       TypeColor, true)),
+					   &CCSBackendConceptTestEnvironmentInterface::WriteListAtKey,
 					   TypeList,
 					   "color_list_setting",
 					   boost::bind (SetListReadExpectation, _1, _2),
@@ -885,31 +1098,62 @@
     SCOPED_TRACE (CCSBackendConformanceTest::GetParam ()->what () + "Read");
 
     CCSBackendConformanceTest::GetParam ()->testEnv ()->PreRead (gmockContext, gmockPlugin, gmockSetting, GetParam ()->type ());
-    CCSBackendConformanceTest::GetParam ()->nativeWrite () (pluginName, settingName, VALUE);
+    CCSBackendConformanceTest::GetParam ()->nativeWrite (CCSBackendConformanceTest::GetParam ()->testEnv (),
+							 pluginName, settingName, VALUE);
     CCSBackendConformanceTest::GetParam ()->testEnv ()->PostRead (gmockContext, gmockPlugin, gmockSetting, GetParam ()->type ());
     CCSBackendConformanceTest::GetParam ()->setReadExpectation () (gmockSetting, VALUE);
 
     ccsBackendReadSetting (CCSBackendConformanceTest::GetBackend (), context, setting);
 }
 
+TEST_P (CCSBackendConformanceTestReadWrite, TestUpdateMockedValue)
+{
+    SCOPED_TRACE (CCSBackendConformanceTest::GetParam ()->what () + "UpdateMocked");
+
+    CCSBackendConformanceTest::GetParam ()->testEnv ()->PreUpdate (gmockContext, gmockPlugin, gmockSetting, GetParam ()->type ());
+    CCSBackendConformanceTest::GetParam ()->nativeWrite (CCSBackendConformanceTest::GetParam ()->testEnv (),
+							 pluginName, settingName, VALUE);
+    CCSBackendConformanceTest::GetParam ()->testEnv ()->PostUpdate (gmockContext, gmockPlugin, gmockSetting, GetParam ()->type ());
+    CCSBackendConformanceTest::GetParam ()->setReadExpectation () (gmockSetting, VALUE);
+
+    ccsBackendUpdateSetting (CCSBackendConformanceTest::GetBackend (), context, plugin, setting);
+}
+
+TEST_P (CCSBackendConformanceTestReadWrite, TestUpdateKeyedValue)
+{
+    SCOPED_TRACE (CCSBackendConformanceTest::GetParam ()->what () + "UpdateMocked");
+
+    CCSBackendConformanceTest::GetParam ()->testEnv ()->PreUpdate (gmockContext, gmockPlugin, gmockSetting, GetParam ()->type ());
+    CCSBackendConformanceTest::GetParam ()->nativeWrite (CCSBackendConformanceTest::GetParam ()->testEnv (),
+							 pluginName, settingName, VALUE);
+    CCSBackendConformanceTest::GetParam ()->testEnv ()->PostUpdate (gmockContext, gmockPlugin, gmockSetting, GetParam ()->type ());
+    CCSBackendConformanceTest::GetParam ()->setReadExpectation () (gmockSetting, VALUE);
+
+    EXPECT_CALL (*gmockContext, findPlugin (_)).WillOnce (Return (plugin));
+    EXPECT_CALL (*gmockPlugin, findSetting (_)).WillOnce (Return (setting));
+
+    EXPECT_TRUE (CCSBackendConformanceTest::GetParam ()->testEnv ()->UpdateSettingAtKey (pluginName, settingName));
+}
+
 TEST_P (CCSBackendConformanceTestReadWrite, TestWriteValue)
 {
     SCOPED_TRACE (CCSBackendConformanceTest::GetParam ()->what () + "Write");
 
     CCSBackendConformanceTest::GetParam ()->testEnv ()->PreWrite (gmockContext, gmockPlugin, gmockSetting, GetParam ()->type ());
     CCSBackendConformanceTest::GetParam ()->setWriteExpectationAndWrite () (pluginName,
-									    settingName,
-									    VALUE,
-									    setting,
-									    boost::bind (ccsBackendWriteSetting,
-											 CCSBackendConformanceTest::GetBackend (),
-											 context,
-											 setting),
-									    GetParam ()->testEnv ());
+									   settingName,
+									   VALUE,
+									   setting,
+									   boost::bind (ccsBackendWriteSetting,
+											CCSBackendConformanceTest::GetBackend (),
+											context,
+										       setting),
+									   GetParam ()->testEnv ());
     CCSBackendConformanceTest::GetParam ()->testEnv ()->PostWrite (gmockContext, gmockPlugin, gmockSetting, GetParam ()->type ());
 
 }
 
 
+
 #endif