05_unity_use_ubuntu_scaling_settings_schemas: also reset gnome values after

(bzr r4253.4.7)

1 files changed, 13 insertions, 3 deletions

diff --git a/tools/migration-scripts/05_unity_use_ubuntu_scaling_settings_schemas b/tools/migration-scripts/05_unity_use_ubuntu_scaling_settings_schemas
index 1273483c0..bf0aafaaa 100755
--- a/tools/migration-scripts/05_unity_use_ubuntu_scaling_settings_schemas
+++ b/tools/migration-scripts/05_unity_use_ubuntu_scaling_settings_schemas
@@ -24,7 +24,7 @@ import os,sys
 GNOME_UI_SETTINGS = "org.gnome.desktop.interface";
 UBUNTU_UI_SETTINGS = "com.ubuntu.user-interface.desktop";
 
-KEYS_TO_MIGRATE = [ "scaling-factor", "text-scaling-factor", "cursor-size" ]
+KEYS_TO_MIGRATE = [ "cursor-size", "scaling-factor", "text-scaling-factor" ]
 
 gnome_ui_schema = Gio.SettingsSchemaSource.get_default().lookup(GNOME_UI_SETTINGS, recursive=False)
 if not gnome_ui_schema:
@@ -43,7 +43,17 @@ for key in KEYS_TO_MIGRATE:
 gnome_value = gnome_settings.get_value(key)
 ubuntu_value = ubuntu_settings.get_value(key)
 
- if ubuntu_value != gnome_value:
- ubuntu_settings.set_value(key, gnome_value)
+ # We reset the gnome values first
+ if gnome_settings.is_writable(key):
+ gnome_settings.reset(key)
+ else:
+ print("Can't reset key '{} {}': in read only.".format(GNOME_UI_SETTINGS, key))
+
+ # Then we migrate the settings, so that u-s-d proxy won't interfere
+ if ubuntu_settings.is_writable(key):
+ if ubuntu_value != gnome_value:
+ ubuntu_settings.set_value(key, gnome_value)
+ else:
+ print("Can't migrate key '{} {}': in read only.".format(UBUNTU_UI_SETTINGS, key))
 
 Gio.Settings.sync()