Merge lp:~seb128/unity-settings-daemon/greeter-scaling-back into lp:unity-settings-daemon

Proposed by Sebastien Bacher
Status: Merged
Approved by: Sebastien Bacher
Approved revision: 4131
Merged at revision: 4131
Proposed branch: lp:~seb128/unity-settings-daemon/greeter-scaling-back
Merge into: lp:unity-settings-daemon
Diff against target: 16 lines (+0/-6)
1 file modified
plugins/xsettings/gsd-xsettings-manager.c (+0/-6)
To merge this branch: bzr merge lp:~seb128/unity-settings-daemon/greeter-scaling-back
Reviewer Review Type Date Requested Status
Sebastien Bacher Approve
Review via email: mp+285449@code.launchpad.net

Commit message

Restore the scaling on the greeter, the menu placement is correct now

Description of the change

Restore the scaling on the greeter, the menu placement is correct now

To post a comment you must log in.
Revision history for this message
Sebastien Bacher (seb128) wrote :

let's try that one

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'plugins/xsettings/gsd-xsettings-manager.c'
--- plugins/xsettings/gsd-xsettings-manager.c 2015-10-22 10:10:01 +0000
+++ plugins/xsettings/gsd-xsettings-manager.c 2016-02-09 10:00:39 +0000
@@ -456,12 +456,6 @@
456 if (g_strcmp0 (g_getenv ("XDG_CURRENT_DESKTOP"), "Unity") == 0)456 if (g_strcmp0 (g_getenv ("XDG_CURRENT_DESKTOP"), "Unity") == 0)
457 goto out;457 goto out;
458458
459 /* Don't scale under unity-greeter, it creates issues,
460 that can be revisited once bug #1286878 and #1434094 are
461 resolved */
462 if (g_strcmp0 (g_getenv ("XDG_SESSION_CLASS"), "greeter") == 0)
463 goto out;
464
465 display = gdk_display_get_default ();459 display = gdk_display_get_default ();
466 screen = gdk_display_get_default_screen (display);460 screen = gdk_display_get_default_screen (display);
467 gdk_screen_get_monitor_geometry (screen, 0, &rect);461 gdk_screen_get_monitor_geometry (screen, 0, &rect);

Subscribers

People subscribed via source and target branches