~cosmos-door/unity-settings-daemon/lp1514544-zesty

« back to all changes in this revision

Viewing changes to plugins/xsettings/gsd-xsettings-manager.c

  • Committer: Bileto Bot
  • Author(s): Alberts Muktupāvels
  • Date: 2016-08-19 17:47:04 UTC
  • mfrom: (4148.1.1 unity-settings-daemon)
  • Revision ID: ci-train-bot@canonical.com-20160819174704-bbg6wr6szhgc0u1a
Use automatic scaling in GNOME Flashback session.

Approved by: Dmitry Shachnev

Show diffs side-by-side

added added

removed removed

Lines of Context:
476
476
                window_scale = 1;
477
477
 
478
478
                /* Under Unity let the shell handle the scaling */
479
 
                if (in_desktop ("Unity"))
 
479
                if (in_desktop ("Unity") && !in_desktop ("GNOME-Flashback"))
480
480
                        goto out;
481
481
 
482
482
                display = gdk_display_get_default ();