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

[Mitsuya Shibata]

Unmerged revisions

4161. By Mitsuya Shibata on 2017-03-25

keyboard: change default layout by locale. Fixes #1514544

=== modified file 'plugins/keyboard/gsd-keyboard-manager.c'
--- plugins/keyboard/gsd-keyboard-manager.c	2016-10-03 09:57:23 +0000
+++ plugins/keyboard/gsd-keyboard-manager.c	2017-03-25 15:54:03 +0000
@@ -1933,6 +1933,26 @@
         manager->priv->device_manager = device_manager;
 }
 
+static const gchar *
+get_default_layout_from_locale (void)
+{
+        const gchar *locale;
+        const gchar *locale_layout[][2] = {
+                { "ja_JP", "jp" },
+        };
+        gint i;
+
+        locale = setlocale (LC_CTYPE, NULL);
+        if (!locale)
+                locale = DEFAULT_LANGUAGE;
+
+        for (i = 0; i < G_N_ELEMENTS (locale_layout); ++i)
+                if (g_str_has_prefix (locale, locale_layout[i][0]))
+                        return locale_layout[i][1];
+
+        return DEFAULT_LAYOUT;
+}
+
 static void
 get_sources_from_xkb_config (GsdKeyboardManager *manager)
 {
@@ -1943,6 +1963,7 @@
         gchar **layouts = NULL;
         gchar **variants = NULL;
         gboolean have_default_layout = FALSE;
+        const gchar *default_layout;
 
         v = g_dbus_proxy_get_cached_property (priv->localed, "X11Layout");
         if (v) {
@@ -1970,6 +1991,7 @@
 
         init_builder_with_sources (&builder, priv->input_sources_settings);
 
+        default_layout = get_default_layout_from_locale();
         for (i = 0; i < n && layouts[i][0]; ++i) {
                 gchar *id;
 
@@ -1978,7 +2000,7 @@
                 else
                         id = g_strdup (layouts[i]);
 
-                if (g_str_equal (id, DEFAULT_LAYOUT))
+                if (g_str_equal (id, default_layout))
                         have_default_layout = TRUE;
 
                 g_variant_builder_add (&builder, "(ss)", INPUT_SOURCE_TYPE_XKB, id);