|
 |
edfd78 |
From 49d2e09887fc4bd1d12f11f5b49ec5f7e091d05c Mon Sep 17 00:00:00 2001
|
|
|
edfd78 |
From: Rui Matos <tiagomatos@gmail.com>
|
|
|
edfd78 |
Date: Mon, 4 Mar 2013 17:32:57 +0100
|
|
|
edfd78 |
Subject: [PATCH] keyboard: Stop adding locale based input sources from a
|
|
|
edfd78 |
hardcoded list
|
|
|
edfd78 |
|
|
|
edfd78 |
This was never meant to be the definite way to do it and we now have
|
|
|
edfd78 |
gnome-initial-setup which is a better place to do this.
|
|
|
edfd78 |
|
|
|
edfd78 |
https://bugzilla.gnome.org/show_bug.cgi?id=685567
|
|
|
edfd78 |
---
|
|
|
edfd78 |
plugins/keyboard/gsd-keyboard-manager.c | 58 +--------------------------------
|
|
|
edfd78 |
1 file changed, 1 insertion(+), 57 deletions(-)
|
|
|
edfd78 |
|
|
|
edfd78 |
diff --git a/plugins/keyboard/gsd-keyboard-manager.c b/plugins/keyboard/gsd-keyboard-manager.c
|
|
|
edfd78 |
index ebfa7d8..b15d355 100644
|
|
|
edfd78 |
--- a/plugins/keyboard/gsd-keyboard-manager.c
|
|
|
edfd78 |
+++ b/plugins/keyboard/gsd-keyboard-manager.c
|
|
|
edfd78 |
@@ -468,58 +468,6 @@ out:
|
|
|
edfd78 |
return (gchar **) g_ptr_array_free (opt_array, FALSE);
|
|
|
edfd78 |
}
|
|
|
edfd78 |
|
|
|
edfd78 |
-static const gchar *
|
|
|
edfd78 |
-engine_from_locale (void)
|
|
|
edfd78 |
-{
|
|
|
edfd78 |
- const gchar *locale;
|
|
|
edfd78 |
- const gchar *locale_engine[][2] = {
|
|
|
edfd78 |
- { "as_IN", "m17n:as:phonetic" },
|
|
|
edfd78 |
- { "bn_IN", "m17n:bn:inscript" },
|
|
|
edfd78 |
- { "gu_IN", "m17n:gu:inscript" },
|
|
|
edfd78 |
- { "hi_IN", "m17n:hi:inscript" },
|
|
|
edfd78 |
- { "ja_JP", "anthy" },
|
|
|
edfd78 |
- { "kn_IN", "m17n:kn:kgp" },
|
|
|
edfd78 |
- { "ko_KR", "hangul" },
|
|
|
edfd78 |
- { "mai_IN", "m17n:mai:inscript" },
|
|
|
edfd78 |
- { "ml_IN", "m17n:ml:inscript" },
|
|
|
edfd78 |
- { "mr_IN", "m17n:mr:inscript" },
|
|
|
edfd78 |
- { "or_IN", "m17n:or:inscript" },
|
|
|
edfd78 |
- { "pa_IN", "m17n:pa:inscript" },
|
|
|
edfd78 |
- { "sd_IN", "m17n:sd:inscript" },
|
|
|
edfd78 |
- { "ta_IN", "m17n:ta:tamil99" },
|
|
|
edfd78 |
- { "te_IN", "m17n:te:inscript" },
|
|
|
edfd78 |
- { "zh_CN", "pinyin" },
|
|
|
edfd78 |
- { "zh_HK", "cangjie3" },
|
|
|
edfd78 |
- { "zh_TW", "chewing" },
|
|
|
edfd78 |
- };
|
|
|
edfd78 |
- gint i;
|
|
|
edfd78 |
-
|
|
|
edfd78 |
- locale = setlocale (LC_CTYPE, NULL);
|
|
|
edfd78 |
- if (!locale)
|
|
|
edfd78 |
- return NULL;
|
|
|
edfd78 |
-
|
|
|
edfd78 |
- for (i = 0; i < G_N_ELEMENTS (locale_engine); ++i)
|
|
|
edfd78 |
- if (g_str_has_prefix (locale, locale_engine[i][0]))
|
|
|
edfd78 |
- return locale_engine[i][1];
|
|
|
edfd78 |
-
|
|
|
edfd78 |
- return NULL;
|
|
|
edfd78 |
-}
|
|
|
edfd78 |
-
|
|
|
edfd78 |
-static void
|
|
|
edfd78 |
-add_ibus_sources_from_locale (GSettings *settings)
|
|
|
edfd78 |
-{
|
|
|
edfd78 |
- const gchar *locale_engine;
|
|
|
edfd78 |
- GVariantBuilder builder;
|
|
|
edfd78 |
-
|
|
|
edfd78 |
- locale_engine = engine_from_locale ();
|
|
|
edfd78 |
- if (!locale_engine)
|
|
|
edfd78 |
- return;
|
|
|
edfd78 |
-
|
|
|
edfd78 |
- init_builder_with_sources (&builder, settings);
|
|
|
edfd78 |
- g_variant_builder_add (&builder, "(ss)", INPUT_SOURCE_TYPE_IBUS, locale_engine);
|
|
|
edfd78 |
- g_settings_set_value (settings, KEY_INPUT_SOURCES, g_variant_builder_end (&builder));
|
|
|
edfd78 |
-}
|
|
|
edfd78 |
-
|
|
|
edfd78 |
static void
|
|
|
edfd78 |
convert_ibus (GSettings *settings)
|
|
|
edfd78 |
{
|
|
|
edfd78 |
@@ -1465,12 +1413,8 @@ maybe_create_initial_settings (GsdKeyboardManager *manager)
|
|
|
edfd78 |
|
|
|
edfd78 |
/* if we still don't have anything do some educated guesses */
|
|
|
edfd78 |
sources = g_settings_get_value (settings, KEY_INPUT_SOURCES);
|
|
|
edfd78 |
- if (g_variant_n_children (sources) < 1) {
|
|
|
edfd78 |
+ if (g_variant_n_children (sources) < 1)
|
|
|
edfd78 |
get_sources_from_xkb_config (manager);
|
|
|
edfd78 |
-#ifdef HAVE_IBUS
|
|
|
edfd78 |
- add_ibus_sources_from_locale (settings);
|
|
|
edfd78 |
-#endif
|
|
|
edfd78 |
- }
|
|
|
edfd78 |
g_variant_unref (sources);
|
|
|
edfd78 |
|
|
|
edfd78 |
options = g_settings_get_strv (settings, KEY_KEYBOARD_OPTIONS);
|
|
|
edfd78 |
--
|
|
|
edfd78 |
1.8.1.4
|
|
|
edfd78 |
|