Merge lp:~robert-ancell/unity-settings-daemon/xdg-current-desktop into lp:unity-settings-daemon

[Robert Ancell]

Correctly check value of XDG_CURRENT_DESKTOP.

[Sebastien Bacher (seb128)]

great

review: Approve

=== modified file 'plugins/xsettings/gsd-xsettings-manager.c'
--- plugins/xsettings/gsd-xsettings-manager.c	2016-02-09 09:56:17 +0000
+++ plugins/xsettings/gsd-xsettings-manager.c	2016-03-15 20:36:25 +0000
@@ -434,6 +434,29 @@
         return dpi * factor;
 }
 
+static gboolean
+in_desktop (const gchar *name)
+{
+        const gchar *desktop_name_list;
+        gchar **names;
+        gboolean in_list = FALSE;
+        gint i;
+
+        desktop_name_list = g_getenv ("XDG_CURRENT_DESKTOP");
+        if (!desktop_name_list)
+                return FALSE;
+
+        names = g_strsplit (desktop_name_list, ":", -1);
+        for (i = 0; names[i] && !in_list; i++)
+                if (strcmp (names[i], name) == 0) {
+                        in_list = TRUE;
+                        break;
+                }
+        g_strfreev (names);
+
+        return in_list;
+}
+
 static int
 get_window_scale (GnomeXSettingsManager *manager)
 {
@@ -453,7 +476,7 @@
                 window_scale = 1;
 
                 /* Under Unity let the shell handle the scaling */
-                if (g_strcmp0 (g_getenv ("XDG_CURRENT_DESKTOP"), "Unity") == 0)
+                if (in_desktop ("Unity"))
                         goto out;
 
                 display = gdk_display_get_default ();