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

Proposed by Marco Trevisan (Treviño) on 2017-10-03
Status: Merged
Merged at revision: 449
Proposed branch: lp:~3v1n0/gnome-session/remove-scale-factor-migration
Merge into: lp:~ubuntu-desktop/gnome-session/ubuntu
Diff against target: 35 lines (+0/-19)
1 file modified
debian/unity-gnome-shell-migration.18.08.py (+0/-19)
To merge this branch: bzr merge lp:~3v1n0/gnome-session/remove-scale-factor-migration
Reviewer Review Type Date Requested Status
Didier Roche 2017-10-03 Approve on 2017-10-04
Review via email: mp+331726@code.launchpad.net

Commit message

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

To post a comment you must log in.
Jeremy Bicha (jbicha) wrote :

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 (didrocks) wrote :

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 (didrocks) wrote :

Let's merge this meanwhile

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/unity-gnome-shell-migration.18.08.py'
2--- debian/unity-gnome-shell-migration.18.08.py 2017-08-17 07:42:38 +0000
3+++ debian/unity-gnome-shell-migration.18.08.py 2017-10-03 17:03:03 +0000
4@@ -60,17 +60,6 @@
5 gs_settings.sync() # force sync to avoid race
6
7
8-def reset_scaling_factor():
9-
10- gs_settings = Gio.Settings.new("org.gnome.desktop.interface")
11- for key in ["cursor-size", "scaling-factor", "text-scaling-factor"]:
12- if not gs_settings.is_writable(key):
13- print("Can't reset factor-reset key '%s': in read only." % key)
14- continue
15- gs_settings.reset(key)
16- gs_settings.sync() # force sync to avoid race
17-
18-
19 def migrate_launcher_properties():
20 unity_settings = Gio.Settings.new_with_path(UNITY_COMPIZ_LAUNCHER_SETTINGS, UNITY_COMPIZ_LAUNCHER_SETTINGS_PATH)
21 dock_settings = Gio.Settings.new(DOCK_SETTINGS)
22@@ -101,13 +90,5 @@
23 print("Unity or GNOME Shell not installed: no migration needed")
24 sys.exit(0)
25
26- # Only run that in the ubuntu/ubuntu-wayland main sessions
27- # (we don't want to reset scale factor for people who
28- # continue to run unity)
29- current_session = os.getenv("DESKTOP_SESSION", "")
30- if current_session not in ("ubuntu", "ubuntu-wayland"):
31- sys.exit(0)
32-
33 migrate_unity_launchers()
34 migrate_launcher_properties()
35- reset_scaling_factor()

Subscribers

People subscribed via source and target branches