← Back to branch summary

~ci-train-bot/unity-settings-daemon/unity-settings-daemon-ubuntu-yakkety-2037

« back to all changes in this revision

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

  • Committer: Bileto Bot
  • Author(s): Robert Ancell
  • Date: 2016-06-13 11:28:47 UTC
  • mfrom: (4132.1.1 xdg-current-desktop)
  • Revision ID: ci-train-bot@canonical.com-20160613112847-fh30smoowpkwa9hn
Correctly check value of XDG_CURRENT_DESKTOP.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/xsettings/gsd-xsettings-manager.c
434
434
        return dpi * factor;
435
435
}
436
436
 
 
437
static gboolean
 
438
in_desktop (const gchar *name)
 
439
{
 
440
        const gchar *desktop_name_list;
 
441
        gchar **names;
 
442
        gboolean in_list = FALSE;
 
443
        gint i;
 
444
 
 
445
        desktop_name_list = g_getenv ("XDG_CURRENT_DESKTOP");
 
446
        if (!desktop_name_list)
 
447
                return FALSE;
 
448
 
 
449
        names = g_strsplit (desktop_name_list, ":", -1);
 
450
        for (i = 0; names[i] && !in_list; i++)
 
451
                if (strcmp (names[i], name) == 0) {
 
452
                        in_list = TRUE;
 
453
                        break;
 
454
                }
 
455
        g_strfreev (names);
 
456
 
 
457
        return in_list;
 
458
}
 
459
 
437
460
static int
438
461
get_window_scale (GnomeXSettingsManager *manager)
439
462
{
453
476
                window_scale = 1;
454
477
 
455
478
                /* Under Unity let the shell handle the scaling */
456
 
                if (g_strcmp0 (g_getenv ("XDG_CURRENT_DESKTOP"), "Unity") == 0)
 
479
                if (in_desktop ("Unity"))
457
480
                        goto out;
458
481
 
459
482
                display = gdk_display_get_default ();