Unity

Merge lp:~didrocks/unity/move-schema into lp:unity

  1. move-schema
  2. Merge into trunk
Proposed by Didier Roche on 2012-07-19
Status: Merged
Approved by: Didier Roche on 2012-07-19
Approved revision: 2512
Merged at revision: 2512
Proposed branch: lp:~didrocks/unity/move-schema
Merge into: lp:unity
Diff against target: 70 lines (+11/-6)
3 files modified
com.canonical.Unity.gschema.xml (+5/-5)
tests/test_favorite_store_gsettings.cpp (+1/-1)
tools/migration-scripts/01_unity_change_dconf_path (+5/-0)
To merge this branch: bzr merge lp:~didrocks/unity/move-schema
Reviewer Review Type Date Requested Status
jenkins (community) continuous-integration Approve on 2012-07-19
Michal Hruby (community) 2012-07-19 Approve on 2012-07-19
Review via email: mp+115696@code.launchpad.net

Commit Message

Migration session from /desktop/unity/ to /com/canonical/unity/ as the dconf
documentation recommends

Description of the Change

Migration session from /desktop/unity/ to /com/canonical/unity/ as the dconf
documentation recommends

To post a comment you must log in.
Michal Hruby (mhr3) wrote :

As Didier explained on IRC this should be safe, the paths themselves aren't that important for the consumers of GSettings APIs plus there's the auto-migration.

review: Approve
Unity Merger (unity-merger) wrote :

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity/952/console reported an error when processing this lp:~didrocks/unity/move-schema branch.
Not merging it.

jenkins (martin-mrazik+qa) wrote :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'com.canonical.Unity.gschema.xml'
2--- com.canonical.Unity.gschema.xml 2012-05-22 10:15:47 +0000
3+++ com.canonical.Unity.gschema.xml 2012-07-19 10:38:22 +0000
4@@ -10,7 +10,7 @@
5 <value nick="Expanded" value="1" />
6 </enum>
7
8- <schema path="/desktop/unity/" id="com.canonical.Unity" gettext-domain="unity">
9+ <schema path="/com/canonical/unity/" id="com.canonical.Unity" gettext-domain="unity">
10 <key enum="form-factor-enum" name="form-factor">
11 <default>"Automatic"</default>
12 <summary>The form factor Unity should target.</summary>
13@@ -22,7 +22,7 @@
14 <description>Whether the home screen should be expanded.</description>
15 </key>
16 </schema>
17- <schema path="/desktop/unity/launcher/" id="com.canonical.Unity.Launcher" gettext-domain="unity">
18+ <schema path="/com/canonical/unity/launcher/" id="com.canonical.Unity.Launcher" gettext-domain="unity">
19 <key type="as" name="favorites">
20 <default>[ 'ubiquity-gtkui.desktop', 'nautilus-home.desktop', 'firefox.desktop', 'libreoffice-writer.desktop', 'libreoffice-calc.desktop', 'libreoffice-impress.desktop', 'ubuntu-software-center.desktop', 'ubuntuone-installer.desktop', 'gnome-control-center.desktop' ]</default>
21 <summary>List of desktop file ids for favorites on the launcher.</summary>
22@@ -34,21 +34,21 @@
23 <description>This is a detection key for the favorite migration script to know whether the needed migration is done or not.</description>
24 </key>
25 </schema>
26- <schema path="/desktop/unity/panel/" id="com.canonical.Unity.Panel" gettext-domain="unity">
27+ <schema path="/com/canonical/unity/panel/" id="com.canonical.Unity.Panel" gettext-domain="unity">
28 <key type="as" name="systray-whitelist">
29 <default>[ 'JavaEmbeddedFrame', 'Wine', 'Update-notifier' ]</default>
30 <summary>List of client names, resource classes or wm classes to allow in the Panel's systray implementation.</summary>
31 <description>"" (empty) will not allow any tray icons, "all" will allow all tray icons, otherwise there will be an attempt to match each icon to a value here.</description>
32 </key>
33 </schema>
34- <schema path="/desktop/unity/devices/" id="com.canonical.Unity.Devices" gettext-domain="unity">
35+ <schema path="/com/canonical/unity/devices/" id="com.canonical.Unity.Devices" gettext-domain="unity">
36 <key type="as" name="favorites">
37 <default>[]</default>
38 <summary>List of device uuid for favorites on the launcher.</summary>
39 <description>These devices are shown in the Launcher by default.</description>
40 </key>
41 </schema>
42- <schema path="/desktop/unity/dash/" id="com.canonical.Unity.Dash" gettext-domain="unity">
43+ <schema path="/com/canonical/unity/dash/" id="com.canonical.Unity.Dash" gettext-domain="unity">
44 <key type="as" name="home-lens-ordering">
45 <default>[ 'applications.lens', 'files.lens', 'music.lens' ]</default>
46 <summary>List of lens ids specifying how lenses should be ordered in the Dash home screen.</summary>
47
48=== modified file 'tests/test_favorite_store_gsettings.cpp'
49--- tests/test_favorite_store_gsettings.cpp 2012-04-10 04:33:05 +0000
50+++ tests/test_favorite_store_gsettings.cpp 2012-07-19 10:38:22 +0000
51@@ -43,7 +43,7 @@
52 // Constant
53 const gchar* SCHEMA_DIRECTORY = BUILDDIR"/settings";
54 const gchar* BASE_STORE_FILE = BUILDDIR"/settings/test-favorite-store-gsettings.store";
55-const gchar* BASE_STORE_CONTENTS = "[desktop/unity/launcher]\n" \
56+const gchar* BASE_STORE_CONTENTS = "[com/canonical/unity/launcher]\n" \
57 "favorites=['%s', '%s', '%s']";
58
59 const char* base_store_favs[] = { BUILDDIR"/tests/data/ubuntuone-installer.desktop",
60
61=== added directory 'tools/migration-scripts'
62=== added file 'tools/migration-scripts/01_unity_change_dconf_path'
63--- tools/migration-scripts/01_unity_change_dconf_path 1970-01-01 00:00:00 +0000
64+++ tools/migration-scripts/01_unity_change_dconf_path 2012-07-19 10:38:22 +0000
65@@ -0,0 +1,5 @@
66+set -ex
67+
68+dconf dump /desktop/unity/ | dconf load /com/canonical/unity/
69+dconf reset -f /desktop/unity/
70+