Merge lp:~3v1n0/gnome-session/remove-scale-factor-migration into lp:~ubuntu-desktop/gnome-session/ubuntu

[Marco Trevisan (Treviño)]

unity-gnome-shell-migration.18.08: remove scaling factor reset

This will be done at unity level, only in the case unity is installed then

See more at https://code.launchpad.net/~3v1n0/unity/use-scaling-ubuntu-schemas-settings/+merge/331667

[Jeremy Bícha (jbicha)]

Didier, please update gnome-session to 3.26.1 when you upload this.

https://git.gnome.org/browse/gnome-session/log?h=gnome-3-26

[Didier Roche-Tolomelli (didrocks)]

I'll merge and upload this with another gnome-session change I need to do (it can land independently of the other changes).

[Didier Roche-Tolomelli (didrocks)]

Let's merge this meanwhile

review: Approve

=== modified file 'debian/unity-gnome-shell-migration.18.08.py'
--- debian/unity-gnome-shell-migration.18.08.py	2017-08-17 07:42:38 +0000
+++ debian/unity-gnome-shell-migration.18.08.py	2017-10-03 17:03:03 +0000
@@ -60,17 +60,6 @@
     gs_settings.sync() # force sync to avoid race
 
 
-def reset_scaling_factor():
-
-    gs_settings = Gio.Settings.new("org.gnome.desktop.interface")
-    for key in ["cursor-size", "scaling-factor", "text-scaling-factor"]:
-        if not gs_settings.is_writable(key):
-            print("Can't reset factor-reset key '%s': in read only." % key)
-            continue
-        gs_settings.reset(key)
-    gs_settings.sync() # force sync to avoid race
-
-
 def migrate_launcher_properties():
     unity_settings = Gio.Settings.new_with_path(UNITY_COMPIZ_LAUNCHER_SETTINGS, UNITY_COMPIZ_LAUNCHER_SETTINGS_PATH)
     dock_settings = Gio.Settings.new(DOCK_SETTINGS)
@@ -101,13 +90,5 @@
         print("Unity or GNOME Shell not installed: no migration needed")
         sys.exit(0)
 
-    # Only run that in the ubuntu/ubuntu-wayland main sessions
-    # (we don't want to reset scale factor for people who
-    # continue to run unity)
-    current_session = os.getenv("DESKTOP_SESSION", "")
-    if current_session not in ("ubuntu", "ubuntu-wayland"):
-        sys.exit(0)
-
     migrate_unity_launchers()
     migrate_launcher_properties()
-    reset_scaling_factor()