Merge lp:~fboucault/unity-2d/dconf_migration_super_key into lp:unity-2d/3.0
Proposed by
Florian Boucault
Status: | Merged |
---|---|
Approved by: | Didier Roche-Tolomelli |
Approved revision: | 634 |
Merged at revision: | 634 |
Proposed branch: | lp:~fboucault/unity-2d/dconf_migration_super_key |
Merge into: | lp:unity-2d/3.0 |
Diff against target: |
304 lines (+78/-20) 13 files modified
.bzrignore (+1/-0) CMakeLists.txt (+26/-0) data/com.canonical.Unity2d.gschema.xml (+9/-0) data/unity-2d.convert (+2/-0) debian/20_unity-2d-gconf-default (+0/-1) debian/changelog (+10/-1) debian/control (+1/-0) debian/gconf/schemas/unity-2d.schemas (+0/-12) debian/unity-2d.install (+2/-0) launcher/app/CMakeLists.txt (+3/-0) launcher/app/launcherview.cpp (+12/-3) launcher/app/launcherview.h (+4/-3) libunity-2d-private/src/unity2dapplication.cpp (+8/-0) |
To merge this branch: | bzr merge lp:~fboucault/unity-2d/dconf_migration_super_key |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Didier Roche-Tolomelli | Approve | ||
Review via email:
|
Description of the change
[launcher] Migrated GConf key /desktop/
Added a GSettings schemas file and a GConf-to-GSettings conversion file.
Packaging changes:
* debian/
- install GSettings schemas into usr/share/
- install GConf to GSettings conversion into usr/share/
* debian/
- remove GConf schema for /desktop/
* debian/control:
- add dependency on libdconf-qt-dev
To post a comment you must log in.
compile and works well.
However, we try now to enforce sane dconf values, and not only for desrt ;)
so, can you please use as a gsettings path some /com/canonical/ one? instead of /desktop/unity-2d (it should match the id com.canonical.* for non relocatable schemas)
Maybe a stupid question, but shouldn't updateSuperKeyM onitoring( ) SLOT take the bool parameter rather than asking dconf again about which value for this property?
Apart from that, all looks good, it works and changing the value in dconf-editor has indeed some effect. Nice work :)