Merge lp://staging/~compiz-team/compiz-libcompizconfig/compiz-libcompizconfig.fix_873772 into lp://staging/compiz-libcompizconfig
Status: | Superseded |
---|---|
Proposed branch: | lp://staging/~compiz-team/compiz-libcompizconfig/compiz-libcompizconfig.fix_873772 |
Merge into: | lp://staging/compiz-libcompizconfig |
Diff against target: |
1659 lines (+592/-333) 8 files modified
backend/src/ini.c (+13/-13) include/ccs.h (+19/-13) plugin/ccp/src/ccp.cpp (+1/-1) src/CMakeLists.txt (+1/-0) src/ccs-private.h (+6/-0) src/compiz.cpp (+116/-109) src/lists.c (+1/-1) src/main.c (+435/-196) |
To merge this branch: | bzr merge lp://staging/~compiz-team/compiz-libcompizconfig/compiz-libcompizconfig.fix_873772 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Compiz Maintainers | Pending | ||
Review via email:
|
This proposal has been superseded by a proposal from 2012-04-13.
Description of the change
Unmerged revisions
- 427. By Sam Spilsbury
-
Use some more descriptive names
- 426. By Sam Spilsbury
-
Merge trunk, fix leaks and provide a way for distributions to lock down settings keys
Provide a file in DATADIR/
compizconfig/ lockdown/ profile. lockdown , this file
will be used to read from in the even that any key value that the user has set
is read from (eg, not default). Provide an ini file of the same format as the
standard ini backend with the key values which will be enforced for that profile.active_plugins is an exception, any items in active_plugins will be forced to be in
the list, but the user is allowed to enable other plugins as well. The list will
be automatically sorted.Eg:
[core]
s0_active_plugins = core;composite;opengl; move;resize; decor; [move]
s0_lazy_positioning = TrueWill ensure that core, composite, opengl, move, resize, decor will always be
on, even if the user tries to turn them off for that profile. It will also
ensure that lazy positioning will always be on, even if the user tries to
turn it off.Fixes LP#881904
- 425. By Sam Spilsbury
-
Added a method for distributions to override the defaults specified
in plugin metadataA profile.defaults file should be placed in DATADIR/
compizconfig/ defaults which
will be read from when defaults are being processed, eg, when a setting has
no user set value or when settings are being reset to the defaults
Your CMakeList.txt file has the datadir twice.
Also, can we get some tests to illustrate the override behaviour?