Merge lp:~cosmos-door/unity-settings-daemon/lp1514544 into lp:unity-settings-daemon

[Mitsuya Shibata]

[Sebastien Bacher (seb128)]

Thank you for your work, I think the "us" layout is needed for keybindings to work cross layouts though (e.g have "ctrl-C" copying even if your current layout is japanese)

Unmerged revisions

4118. By Mitsuya Shibata on 2015-11-09

keyboard: use default layout only when layouts is empty. Fixes #1514544

=== modified file 'plugins/keyboard/gsd-keyboard-manager.c'
--- plugins/keyboard/gsd-keyboard-manager.c	2015-10-28 17:52:16 +0000
+++ plugins/keyboard/gsd-keyboard-manager.c	2015-11-09 18:38:09 +0000
@@ -1916,7 +1916,7 @@
         gint i, n;
         gchar **layouts = NULL;
         gchar **variants = NULL;
-        gboolean have_default_layout = FALSE;
+        gboolean use_default_layout = TRUE;
 
         v = g_dbus_proxy_get_cached_property (priv->localed, "X11Layout");
         if (v) {
@@ -1952,14 +1952,14 @@
                 else
                         id = g_strdup (layouts[i]);
 
-                if (g_str_equal (id, DEFAULT_LAYOUT))
-                        have_default_layout = TRUE;
+                if (use_default_layout)
+                        use_default_layout = FALSE;
 
                 g_variant_builder_add (&builder, "(ss)", INPUT_SOURCE_TYPE_XKB, id);
                 g_free (id);
         }
 
-        if (!have_default_layout)
+        if (use_default_layout)
                 g_variant_builder_add (&builder, "(ss)", INPUT_SOURCE_TYPE_XKB, DEFAULT_LAYOUT);
 
         g_settings_set_value (priv->input_sources_settings, KEY_INPUT_SOURCES, g_variant_builder_end (&builder));