Merge lp:~seb128/unity-settings-daemon/dont-scale-greeter into lp:unity-settings-daemon

Proposed by Sebastien Bacher on 2015-04-08
Status: Merged
Approved by: Sebastien Bacher on 2015-04-08
Approved revision: 4082
Merged at revision: 4082
Proposed branch: lp:~seb128/unity-settings-daemon/dont-scale-greeter
Merge into: lp:unity-settings-daemon
Diff against target: 16 lines (+6/-0)
1 file modified
plugins/xsettings/gsd-xsettings-manager.c (+6/-0)
To merge this branch: bzr merge lp:~seb128/unity-settings-daemon/dont-scale-greeter
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve on 2015-04-08
Lars Karlitski (community) Approve on 2015-04-08
Unity Settings Daemon Development Team 2015-04-08 Pending
Review via email: mp+255512@code.launchpad.net

Commit message

Don't scale under unity-greeter, it creates issues. That can be revisited
once bug #1286878 and #1434094 are resolved but that's not going
to be for this cycle

Description of the change

Don't scale under unity-greeter, it creates issues. That can be revisited
once bug #1286878 and #1434094 are resolved but that's not going
to be for this cycle

To post a comment you must log in.
Lars Karlitski (larsu) wrote :

Now I'm curious about XDG_SESSION_CLASS :)

Looks good and I agree with the reasoning. Thanks.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/xsettings/gsd-xsettings-manager.c'
2--- plugins/xsettings/gsd-xsettings-manager.c 2015-02-18 15:10:15 +0000
3+++ plugins/xsettings/gsd-xsettings-manager.c 2015-04-08 13:35:01 +0000
4@@ -455,6 +455,12 @@
5 if (g_strcmp0 (g_getenv ("XDG_CURRENT_DESKTOP"), "Unity") == 0)
6 goto out;
7
8+ /* Don't scale under unity-greeter, it creates issues,
9+ that can be revisited once bug #1286878 and #1434094 are
10+ resolved */
11+ if (g_strcmp0 (g_getenv ("XDG_SESSION_CLASS"), "greeter") == 0)
12+ goto out;
13+
14 display = gdk_display_get_default ();
15 screen = gdk_display_get_default_screen (display);
16 gdk_screen_get_monitor_geometry (screen, 0, &rect);

Subscribers

People subscribed via source and target branches