Merge lp:~compiz-team/compiz/compiz.fix_1080989 into lp:compiz/0.9.9
Proposed by
Sam Spilsbury
Status: | Merged | ||||||||
---|---|---|---|---|---|---|---|---|---|
Approved by: | Daniel van Vugt | ||||||||
Approved revision: | 3478 | ||||||||
Merged at revision: | 3477 | ||||||||
Proposed branch: | lp:~compiz-team/compiz/compiz.fix_1080989 | ||||||||
Merge into: | lp:compiz/0.9.9 | ||||||||
Diff against target: |
234 lines (+181/-4) 3 files modified
compizconfig/libcompizconfig/src/ccs-config-private.h (+32/-0) compizconfig/libcompizconfig/src/config.c (+12/-4) compizconfig/libcompizconfig/tests/compizconfig_test_ccs_util.cpp (+137/-0) |
||||||||
To merge this branch: | bzr merge lp:~compiz-team/compiz/compiz.fix_1080989 | ||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Daniel van Vugt | Approve | ||
PS Jenkins bot (community) | continuous-integration | Approve | |
Review via email:
|
This proposal supersedes a proposal from 2012-11-20.
Description of the change
If the user overrides COMPIZ_
means that they meant to force the use of the general profile, since it
isn't meant to be set otherwise. Add tests for the new behaviour.
(LP: #1080989)
To post a comment you must log in.
PASSED: Continuous integration, rev:3477 jenkins. qa.ubuntu. com/job/ compiz- ci/253/ jenkins. qa.ubuntu. com/job/ compiz- ci/./build= pbuilder, distribution= quantal, flavor= amd64/253/ console
http://
Executed test runs:
SUCCESS: http://