Merge lp://qastaging/~mterry/unity/gsettings into lp://qastaging/unity/0.2
Proposed by
Gord Allott
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Approved by: | Gord Allott | ||||
| Approved revision: | no longer in the source branch. | ||||
| Merged at revision: | 576 | ||||
| Proposed branch: | lp://qastaging/~mterry/unity/gsettings | ||||
| Merge into: | lp://qastaging/unity/0.2 | ||||
| Diff against target: |
908 lines (+225/-323) 15 files modified
HACKING (+3/-3) configure.ac (+2/-4) data/Makefile.am (+10/-15) data/com.canonical.Unity.gschema.xml.in (+56/-57) data/unity.convert (+10/-0) po/POTFILES.in (+1/-0) targets/mutter/Makefile.am (+0/-1) targets/mutter/plugin.vala (+7/-26) tools/migrate_favorites.py (+17/-2) unity-private/launcher/application-controller.vala (+1/-1) unity-private/launcher/scroller-controller.vala (+2/-2) unity/Makefile.am (+0/-1) unity/chrome-handler.vala (+2/-2) unity/prism-handler.vala (+2/-2) unity/unity-favorites.vala (+112/-207) |
||||
| To merge this branch: | bzr merge lp://qastaging/~mterry/unity/gsettings | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Neil J. Patel | Pending | ||
|
Review via email:
|
|||
This proposal supersedes a proposal from 2010-10-22.
Description of the change
This is to convert from gconf to gsettings (bug 656326). I've tested it and it seems to work, but would obviously benefit from more testing.
There are a few keys that seem to no longer be used? Maybe now would be a good time to drop them from the schema and the new convert file. I'm thinking of the search_template, search_hint, and webapp_use_chromium keys.
This isn't a *complete* port either, since a few gconf uses reference global desktop keys that are in the process of moving to gsettings. Once they get moved, you can remove gconf altogether. But with this branch, all the unity internal usage is gsettings.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
This doesn't really apply to Unity trunk, but might not be a bad thing to land in Unity 0.2 series if people are picking it up for whatever reason to use on maverick/natty.
Everything looks good, approved. Thanks :)