Merge lp:~compiz-team/compiz/compiz.fix_1063617.3 into lp:compiz/0.9.9
Status: | Merged |
---|---|
Approved by: | Daniel van Vugt |
Approved revision: | 3481 |
Merged at revision: | 3486 |
Proposed branch: | lp:~compiz-team/compiz/compiz.fix_1063617.3 |
Merge into: | lp:compiz/0.9.9 |
Diff against target: |
598 lines (+379/-158) 3 files modified
compizconfig/libcompizconfig/include/ccs.h (+25/-0) compizconfig/libcompizconfig/src/compiz.cpp (+208/-153) compizconfig/libcompizconfig/tests/compizconfig_test_ccs_setting.cpp (+146/-5) |
To merge this branch: | bzr merge lp:~compiz-team/compiz/compiz.fix_1063617.3 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot (community) | continuous-integration | Needs Fixing | |
Daniel van Vugt | Approve | ||
Review via email: mp+136037@code.launchpad.net |
Commit message
Refactored CCSSettingDefau
ccsSettingDefau
initialize setting default values and info (eg, XML, ProtoBuf or Mock).
Added a simple construction test to prove that it works.
Description of the change
NOTE: I have a branch here which merges all of these together without conflicts, so just don't merge this one directly
This is about preparing a fix for (LP: #1063617).
(LP: #1063617) is really complicated. The problem is that there is a feedback loop between integrated keys and normal keys which can cause the integrated keys to read from normal keys which will be out of date or incorrect because they were never updated.
A part of that problem is that we need to have more information in the backends as to why setting a key to a particular value failed or succeeded.
Refactored CCSSettingDefau
ccsSettingDefau
initialize setting default values and info (eg, XML, ProtoBuf or Mock).
Added a simple construction test to prove that it works.
PASSED: Continuous integration, rev:3481 jenkins. qa.ubuntu. com/job/ compiz- ci/266/ jenkins. qa.ubuntu. com/job/ compiz- ci/./build= pbuilder, distribution= quantal, flavor= amd64/266/ console
http://
Executed test runs:
SUCCESS: http://
Click here to trigger a rebuild: jenkins. qa.ubuntu. com/job/ compiz- ci/266/ /rebuild/?
http://