Updated ibus-HEAD.patch for upstream #1744.

This commit is contained in:
Takao Fujiwara 2014-10-28 15:50:24 +09:00
parent 76e7915d6d
commit c019d134fa
2 changed files with 46 additions and 1 deletions

View File

@ -56,3 +56,45 @@ index b7e1ff8..d9924a1 100644
--
1.8.5.3
From bb818e438599f080a0cffb0b7573d9a646cf3b1a Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Tue, 28 Oct 2014 11:28:46 +0900
Subject: [PATCH] Fix not to SEGV ibus-ui-gtk3 with wrong 'preload-engines'
value.
Fedora internal patch could save engines from the result of
'setxkbmap -query' but they do not exist in simple.xml likes
'xkb:cn::chi' while now the current implementation converts
those engines to 'xkb:us::eng'.
BUG=https://code.google.com/p/ibus/issues/detail?id=1744
TEST=ui/gtk3
Review URL: https://codereview.appspot.com/158640043
---
ui/gtk3/panel.vala | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/ui/gtk3/panel.vala b/ui/gtk3/panel.vala
index 76cea23..7b99fdf 100644
--- a/ui/gtk3/panel.vala
+++ b/ui/gtk3/panel.vala
@@ -790,6 +790,15 @@ class Panel : IBus.PanelService {
var engines = m_bus.get_engines_by_names(names);
+ /* Fedora internal patch could save engines not in simple.xml
+ * likes 'xkb:cn::chi'.
+ */
+ if (engines.length == 0) {
+ names = {"xkb:us::eng"};
+ m_settings_general.set_strv("preload-engines", names);
+ engines = m_bus.get_engines_by_names(names);
+ }
+
if (m_engines.length == 0) {
m_engines = engines;
switch_engine(0, true);
--
1.8.5.3

View File

@ -28,7 +28,7 @@
Name: ibus
Version: 1.5.9
Release: 3%{?dist}
Release: 4%{?dist}
Summary: Intelligent Input Bus for Linux OS
License: LGPLv2+
Group: System Environment/Libraries
@ -408,6 +408,9 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
* Tue Oct 28 2014 Takao Fujiwara <tfujiwar@redhat.com> - 1.5.9-4
- Updated ibus-HEAD.patch for upstream #1744.
* Fri Oct 24 2014 Takao Fujiwara <tfujiwar@redhat.com> - 1.5.9-3
- Added ibus-xx-increase-timeout.patch