Compare commits
13 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
dc2194a325 | ||
|
edb130fd78 | ||
|
0c772a35eb | ||
|
588398fb99 | ||
|
c1d2c085d8 | ||
|
bbe0140977 | ||
|
|
30a786eb76 | ||
|
|
24271ed8b0 | ||
|
|
4d43eca734 | ||
|
|
90458b688a | ||
|
|
5089b34d12 | ||
|
9be49afa7b | ||
|
|
dbd0b5bd3d |
@ -0,0 +1,94 @@
|
||||
From 49d2e09887fc4bd1d12f11f5b49ec5f7e091d05c Mon Sep 17 00:00:00 2001
|
||||
From: Rui Matos <tiagomatos@gmail.com>
|
||||
Date: Mon, 4 Mar 2013 17:32:57 +0100
|
||||
Subject: [PATCH] keyboard: Stop adding locale based input sources from a
|
||||
hardcoded list
|
||||
|
||||
This was never meant to be the definite way to do it and we now have
|
||||
gnome-initial-setup which is a better place to do this.
|
||||
|
||||
https://bugzilla.gnome.org/show_bug.cgi?id=685567
|
||||
---
|
||||
plugins/keyboard/gsd-keyboard-manager.c | 58 +--------------------------------
|
||||
1 file changed, 1 insertion(+), 57 deletions(-)
|
||||
|
||||
diff --git a/plugins/keyboard/gsd-keyboard-manager.c b/plugins/keyboard/gsd-keyboard-manager.c
|
||||
index ebfa7d8..b15d355 100644
|
||||
--- a/plugins/keyboard/gsd-keyboard-manager.c
|
||||
+++ b/plugins/keyboard/gsd-keyboard-manager.c
|
||||
@@ -468,58 +468,6 @@ out:
|
||||
return (gchar **) g_ptr_array_free (opt_array, FALSE);
|
||||
}
|
||||
|
||||
-static const gchar *
|
||||
-engine_from_locale (void)
|
||||
-{
|
||||
- const gchar *locale;
|
||||
- const gchar *locale_engine[][2] = {
|
||||
- { "as_IN", "m17n:as:phonetic" },
|
||||
- { "bn_IN", "m17n:bn:inscript" },
|
||||
- { "gu_IN", "m17n:gu:inscript" },
|
||||
- { "hi_IN", "m17n:hi:inscript" },
|
||||
- { "ja_JP", "anthy" },
|
||||
- { "kn_IN", "m17n:kn:kgp" },
|
||||
- { "ko_KR", "hangul" },
|
||||
- { "mai_IN", "m17n:mai:inscript" },
|
||||
- { "ml_IN", "m17n:ml:inscript" },
|
||||
- { "mr_IN", "m17n:mr:inscript" },
|
||||
- { "or_IN", "m17n:or:inscript" },
|
||||
- { "pa_IN", "m17n:pa:inscript" },
|
||||
- { "sd_IN", "m17n:sd:inscript" },
|
||||
- { "ta_IN", "m17n:ta:tamil99" },
|
||||
- { "te_IN", "m17n:te:inscript" },
|
||||
- { "zh_CN", "pinyin" },
|
||||
- { "zh_HK", "cangjie3" },
|
||||
- { "zh_TW", "chewing" },
|
||||
- };
|
||||
- gint i;
|
||||
-
|
||||
- locale = setlocale (LC_CTYPE, NULL);
|
||||
- if (!locale)
|
||||
- return NULL;
|
||||
-
|
||||
- for (i = 0; i < G_N_ELEMENTS (locale_engine); ++i)
|
||||
- if (g_str_has_prefix (locale, locale_engine[i][0]))
|
||||
- return locale_engine[i][1];
|
||||
-
|
||||
- return NULL;
|
||||
-}
|
||||
-
|
||||
-static void
|
||||
-add_ibus_sources_from_locale (GSettings *settings)
|
||||
-{
|
||||
- const gchar *locale_engine;
|
||||
- GVariantBuilder builder;
|
||||
-
|
||||
- locale_engine = engine_from_locale ();
|
||||
- if (!locale_engine)
|
||||
- return;
|
||||
-
|
||||
- init_builder_with_sources (&builder, settings);
|
||||
- g_variant_builder_add (&builder, "(ss)", INPUT_SOURCE_TYPE_IBUS, locale_engine);
|
||||
- g_settings_set_value (settings, KEY_INPUT_SOURCES, g_variant_builder_end (&builder));
|
||||
-}
|
||||
-
|
||||
static void
|
||||
convert_ibus (GSettings *settings)
|
||||
{
|
||||
@@ -1465,12 +1413,8 @@ maybe_create_initial_settings (GsdKeyboardManager *manager)
|
||||
|
||||
/* if we still don't have anything do some educated guesses */
|
||||
sources = g_settings_get_value (settings, KEY_INPUT_SOURCES);
|
||||
- if (g_variant_n_children (sources) < 1) {
|
||||
+ if (g_variant_n_children (sources) < 1)
|
||||
get_sources_from_xkb_config (manager);
|
||||
-#ifdef HAVE_IBUS
|
||||
- add_ibus_sources_from_locale (settings);
|
||||
-#endif
|
||||
- }
|
||||
g_variant_unref (sources);
|
||||
|
||||
options = g_settings_get_strv (settings, KEY_KEYBOARD_OPTIONS);
|
||||
--
|
||||
1.8.1.4
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,20 +0,0 @@
|
||||
--- gnome-settings-daemon-3.8.0/plugins/keyboard/gsd-keyboard-manager.c~ 2013-03-21 17:12:16.000000000 +0900
|
||||
+++ gnome-settings-daemon-3.8.0/plugins/keyboard/gsd-keyboard-manager.c 2013-04-04 15:15:46.026364282 +0900
|
||||
@@ -453,7 +453,7 @@
|
||||
{ "bn_IN", "m17n:bn:inscript" },
|
||||
{ "gu_IN", "m17n:gu:inscript" },
|
||||
{ "hi_IN", "m17n:hi:inscript" },
|
||||
- { "ja_JP", "anthy" },
|
||||
+ { "ja_JP", "kkc" },
|
||||
{ "kn_IN", "m17n:kn:kgp" },
|
||||
{ "ko_KR", "hangul" },
|
||||
{ "mai_IN", "m17n:mai:inscript" },
|
||||
@@ -464,7 +464,7 @@
|
||||
{ "sd_IN", "m17n:sd:inscript" },
|
||||
{ "ta_IN", "m17n:ta:tamil99" },
|
||||
{ "te_IN", "m17n:te:inscript" },
|
||||
- { "zh_CN", "pinyin" },
|
||||
+ { "zh_CN", "libpinyin" },
|
||||
{ "zh_HK", "cangjie3" },
|
||||
{ "zh_TW", "chewing" },
|
||||
};
|
||||
@ -1,6 +1,6 @@
|
||||
Name: gnome-settings-daemon
|
||||
Version: 3.8.1
|
||||
Release: 2%{?dist}
|
||||
Version: 3.8.6.1
|
||||
Release: 1%{?dist}
|
||||
Summary: The daemon sharing settings from GNOME to GTK+/KDE applications
|
||||
|
||||
Group: System Environment/Daemons
|
||||
@ -10,10 +10,11 @@ URL: http://download.gnome.org/sources/%{name}
|
||||
Source: http://download.gnome.org/sources/%{name}/3.8/%{name}-%{version}.tar.xz
|
||||
# disable wacom for ppc/ppc64 (used on RHEL)
|
||||
Patch0: %{name}-3.5.4-ppc-no-wacom.patch
|
||||
# fedora has newer different default ibus engines for Chinese and Japanese
|
||||
Patch1: %{name}-ibus-kkc-libpinyin.patch
|
||||
# g-i-s takes this role now
|
||||
Patch1: 0001-keyboard-Stop-adding-locale-based-input-sources-from.patch
|
||||
|
||||
Requires: control-center-filesystem
|
||||
Requires: colord
|
||||
|
||||
BuildRequires: dbus-glib-devel
|
||||
BuildRequires: gtk3-devel >= 3.7.8
|
||||
@ -78,7 +79,7 @@ The %{name}-updates package contains the updates plugin for %{name}
|
||||
%if 0%{?rhel}
|
||||
%patch0 -p1 -b .ppc-no-wacom
|
||||
%endif
|
||||
%patch1 -p1 -b .ibus-anthy-pinyin
|
||||
%patch1 -p1
|
||||
|
||||
autoreconf -i -f
|
||||
|
||||
@ -205,9 +206,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
|
||||
%{_libdir}/gnome-settings-daemon-3.0/libgsd.so
|
||||
|
||||
%{_libexecdir}/gnome-settings-daemon
|
||||
%{_libexecdir}/gnome-settings-daemon-localeexec
|
||||
%{_libexecdir}/gsd-locate-pointer
|
||||
%{_libexecdir}/gsd-printer
|
||||
%{_libexecdir}/gsd-input-sources-switcher
|
||||
|
||||
%{_datadir}/gnome-settings-daemon/
|
||||
%{_sysconfdir}/xdg/autostart/gnome-settings-daemon.desktop
|
||||
@ -255,6 +256,36 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
|
||||
%{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.updates.gschema.xml
|
||||
|
||||
%changelog
|
||||
* Mon Jan 20 2014 Richard Hughes <rhughes@redhat.com> - 3.8.6.1-1
|
||||
- Update to 3.8.6.1
|
||||
|
||||
* Fri Sep 6 2013 Rui Matos <rmatos@redhat.com> - 3.8.5-1
|
||||
- Update to 3.8.5
|
||||
- Drop upstreamed patches
|
||||
|
||||
* Wed Aug 7 2013 Marek Kasik <mkasik@redhat.com> - 3.8.4-2
|
||||
- Backport fixes for getting of notifications from remote CUPS servers
|
||||
- Resolves: #886845
|
||||
|
||||
* Fri Jul 19 2013 Bastien Nocera <bnocera@redhat.com> 3.8.4-1
|
||||
- Update to 3.8.4
|
||||
|
||||
* Sun Jun 16 2013 Kalev Lember <kalevlember@gmail.com> - 3.8.3-3
|
||||
- Backport more upstream fixes for the localeexec helper (#974778)
|
||||
|
||||
* Mon Jun 10 2013 Matthias Clasen <mclasen@redhat.com> - 3.8.3-2
|
||||
- Avoid calling setenv after threads are initialized (#919855)
|
||||
|
||||
* Fri Jun 7 2013 Rui Matos <rmatos@redhat.com> - 3.8.3-1
|
||||
- Update to 3.8.3
|
||||
|
||||
* Fri May 17 2013 Rui Matos <rmatos@redhat.com>
|
||||
- Add a patch to stop adding input sources automatically based on
|
||||
locale since that's now gnome-initial-setup's job
|
||||
|
||||
* Tue May 14 2013 Richard Hughes <rhughes@redhat.com> - 3.8.2-1
|
||||
- Update to 3.8.2
|
||||
|
||||
* Thu May 9 2013 Jens Petersen <petersen@redhat.com> - 3.8.1-2
|
||||
- default ibus engine in Fedora is now kkc for Japanese
|
||||
and libpinyin for Chinese (#948117)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user