Compiz Configuration Library

Merge lp://staging/~smspillaz/compiz-libcompizconfig/compiz-libcompizconfig.fix_873772.2 into lp://staging/~compiz-team/compiz-libcompizconfig/0.9.8

  1. compiz-libcompizconfig.fix_873772.2
  2. Merge into 0.9.8
Proposed by Sam Spilsbury
Status: Work in progress
Proposed branch: lp://staging/~smspillaz/compiz-libcompizconfig/compiz-libcompizconfig.fix_873772.2
Merge into: lp://staging/~compiz-team/compiz-libcompizconfig/0.9.8
Diff against target: 1796 lines (+629/-342)
13 files modified
NEWS (+8/-0)
VERSION (+1/-1)
backend/src/ini.c (+13/-13)
include/ccs.h (+19/-13)
plugin/ccp/CMakeLists.txt (+1/-1)
plugin/ccp/src/ccp.cpp (+2/-5)
src/CMakeLists.txt (+1/-0)
src/bindings.c (+1/-0)
src/ccs-private.h (+6/-0)
src/compiz.cpp (+118/-109)
src/iniparser.c (+17/-2)
src/lists.c (+1/-1)
src/main.c (+441/-197)
To merge this branch: bzr merge lp://staging/~smspillaz/compiz-libcompizconfig/compiz-libcompizconfig.fix_873772.2
Reviewer Review Type Date Requested Status
Compiz Maintainers Pending
Review via email: mp+102790@code.staging.launchpad.net

This proposal supersedes a proposal from 2012-04-13.

Description of the change

Bug 873772

== Problem ==

Distro needs a way to do two things:
1) Override the upstream defaults
2) Override keys entirely

== Solution ==

Added a framework to do both.

Place a profile.defaults in DATADIR/compizconfig/defaults using the ini format to override the default values for settings.
Place a profile.lockdown in DATADIR/compizconfig/lockdown using the ini format to override the values entirely (except for lists, where you can mandate content to be in a list, but appending is allowed)

Also did some cleanup and fixed some obscure bugs in the guest session.

== Testing ==

Probably need to mock out the settings backend to do any kind of meaningful testing.

To post a comment you must log in.
Revision history for this message
Tim Penhey (thumper) wrote : Posted in a previous version of this proposal

Your CMakeList.txt file has the datadir twice.

Also, can we get some tests to illustrate the override behaviour?

Revision history for this message
Sam Spilsbury (smspillaz) wrote :

WIP while we are adding a testing framework to libcompizconfig

Reply

Unmerged revisions

432. By Sam Spilsbury

Merged from lp:~compiz-team/compiz-libcompizconfig/compiz-libcompizconfig.fix_873772
and cleanup

431. By Sam Spilsbury

Don't require ccp to be built

430. By Sam Spilsbury

Don't interfere with glib event loop processing (!) (LP: #932125)

429. By Sam Spilsbury

GTK is stupid and uses Primary instead of Control, so allow Primary too,
but convert it to ControlMask (LP: #936840)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches