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

documentation recommends. Fixes: . Approved by jenkins, Michal Hruby. (bzr r2512)

3 files changed, 11 insertions, 6 deletions

diff --git a/com.canonical.Unity.gschema.xml b/com.canonical.Unity.gschema.xml
index 908945793..501cbebd5 100644
--- a/com.canonical.Unity.gschema.xml
+++ b/com.canonical.Unity.gschema.xml
@@ -10,7 +10,7 @@
 <value nick="Expanded" value="1" />
 </enum>
 
- <schema path="/desktop/unity/" id="com.canonical.Unity" gettext-domain="unity">
+ <schema path="/com/canonical/unity/" id="com.canonical.Unity" gettext-domain="unity">
 <key enum="form-factor-enum" name="form-factor">
 <default>"Automatic"</default>
 <summary>The form factor Unity should target.</summary>
@@ -22,7 +22,7 @@
 <description>Whether the home screen should be expanded.</description>
 </key>
 </schema>
- <schema path="/desktop/unity/launcher/" id="com.canonical.Unity.Launcher" gettext-domain="unity">
+ <schema path="/com/canonical/unity/launcher/" id="com.canonical.Unity.Launcher" gettext-domain="unity">
 <key type="as" name="favorites">
 <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>
 <summary>List of desktop file ids for favorites on the launcher.</summary>
@@ -34,21 +34,21 @@
 <description>This is a detection key for the favorite migration script to know whether the needed migration is done or not.</description>
 </key>
 </schema>
- <schema path="/desktop/unity/panel/" id="com.canonical.Unity.Panel" gettext-domain="unity">
+ <schema path="/com/canonical/unity/panel/" id="com.canonical.Unity.Panel" gettext-domain="unity">
 <key type="as" name="systray-whitelist">
 <default>[ 'JavaEmbeddedFrame', 'Wine', 'Update-notifier' ]</default>
 <summary>List of client names, resource classes or wm classes to allow in the Panel's systray implementation.</summary>
 <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>
 </key>
 </schema>
- <schema path="/desktop/unity/devices/" id="com.canonical.Unity.Devices" gettext-domain="unity">
+ <schema path="/com/canonical/unity/devices/" id="com.canonical.Unity.Devices" gettext-domain="unity">
 <key type="as" name="favorites">
 <default>[]</default>
 <summary>List of device uuid for favorites on the launcher.</summary>
 <description>These devices are shown in the Launcher by default.</description>
 </key>
 </schema>
- <schema path="/desktop/unity/dash/" id="com.canonical.Unity.Dash" gettext-domain="unity">
+ <schema path="/com/canonical/unity/dash/" id="com.canonical.Unity.Dash" gettext-domain="unity">
 <key type="as" name="home-lens-ordering">
 <default>[ 'applications.lens', 'files.lens', 'music.lens' ]</default>
 <summary>List of lens ids specifying how lenses should be ordered in the Dash home screen.</summary>
diff --git a/tests/test_favorite_store_gsettings.cpp b/tests/test_favorite_store_gsettings.cpp
index 8609d9379..9604dc712 100644
--- a/tests/test_favorite_store_gsettings.cpp
+++ b/tests/test_favorite_store_gsettings.cpp
@@ -43,7 +43,7 @@ namespace {
 // Constant
 const gchar* SCHEMA_DIRECTORY = BUILDDIR"/settings";
 const gchar* BASE_STORE_FILE = BUILDDIR"/settings/test-favorite-store-gsettings.store";
-const gchar* BASE_STORE_CONTENTS = "[desktop/unity/launcher]\n" \
+const gchar* BASE_STORE_CONTENTS = "[com/canonical/unity/launcher]\n" \
 "favorites=['%s', '%s', '%s']";
 
 const char* base_store_favs[] = { BUILDDIR"/tests/data/ubuntuone-installer.desktop",
diff --git a/tools/migration-scripts/01_unity_change_dconf_path b/tools/migration-scripts/01_unity_change_dconf_path
new file mode 100755
index 000000000..9ffa4a047
--- /dev/null
+++ b/tools/migration-scripts/01_unity_change_dconf_path
@@ -0,0 +1,5 @@
+set -ex
+
+dconf dump /desktop/unity/ | dconf load /com/canonical/unity/
+dconf reset -f /desktop/unity/
+