Merge lp:~laney/unity-settings-daemon/lp1554878 into lp:unity-settings-daemon

[Iain Lane]

Check XDG_CURRENT_DESKTOP properly in the keyboard plugin

Check XDG_CURRENT_DESKTOP properly in the keyboard plugin

[Iain Lane (laney)]

Self approvin'

review: Approve

=== modified file 'plugins/keyboard/gsd-keyboard-manager.c'
--- plugins/keyboard/gsd-keyboard-manager.c	2016-05-20 16:50:05 +0000
+++ plugins/keyboard/gsd-keyboard-manager.c	2016-10-03 10:08:04 +0000
@@ -977,6 +977,29 @@
         }
 }
 
+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 gchar *
 prepare_xkb_options (GsdKeyboardManager *manager,
                      guint               n_sources,
@@ -1001,7 +1024,7 @@
          * and doesn't call us so we can't set the group switching XKB
          * option in the first place otherwise the X server's switch
          * will take effect and we get a broken configuration. */
-        if (n_sources < 2 || g_strcmp0 (g_getenv ("XDG_CURRENT_DESKTOP"), "Unity") == 0)
+        if (n_sources < 2 || in_desktop ("Unity"))
                 strip_xkb_option (options, "grp:");
 
         options_str = build_xkb_options_string (options);