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

[Sebastien Bacher]

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

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

[Lars Karlitski (larsu)]

Now I'm curious about XDG_SESSION_CLASS :)

Looks good and I agree with the reasoning. Thanks.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:4082
http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-ci/62/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-vivid-amd64-ci/6
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-vivid-armhf-ci/6
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-vivid-i386-ci/6

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-settings-daemon-ci/62/rebuild

review: Approve (continuous-integration)

=== modified file 'plugins/xsettings/gsd-xsettings-manager.c'
--- plugins/xsettings/gsd-xsettings-manager.c	2015-02-18 15:10:15 +0000
+++ plugins/xsettings/gsd-xsettings-manager.c	2015-04-08 13:35:01 +0000
@@ -455,6 +455,12 @@
                 if (g_strcmp0 (g_getenv ("XDG_CURRENT_DESKTOP"), "Unity") == 0)
                         goto out;
 
+                /* Don't scale under unity-greeter, it creates issues, 
+                   that can be revisited once bug #1286878 and #1434094 are
+                   resolved */
+                if (g_strcmp0 (g_getenv ("XDG_SESSION_CLASS"), "greeter") == 0)
+                        goto out;
+
                 display = gdk_display_get_default ();
                 screen = gdk_display_get_default_screen (display);
                 gdk_screen_get_monitor_geometry (screen, 0, &rect);