[rpms/ibus] autotool: Fixed Bug 1574855 - [abrt] ibus: ibus_engine_filter_key_event()

[rpms/ibus] autotool: Fixed Bug 1574855 - [abrt] ibus: ibus_engine_filter_key_event()

[Takao Fujiwara]

A new commit has been pushed.

Repo   : rpms/ibus
Branch : autotool
Commit : 52f775da5dd6cf6ca828092990f6ce943e1c58e3
Author : Takao Fujiwara <tfujiwar@redhat.com>
Date   : 2018-05-07T13:40:53+09:00
Stats  : +29/-1 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/ibus/c/52f775da5dd6cf6ca828092990f6ce943e1c58e3?branch=autotool

Log:
Fixed Bug 1574855 - [abrt] ibus: ibus_engine_filter_key_event()

---
diff --git a/ibus-HEAD.patch b/ibus-HEAD.patch
index 240c0cb..9939fd6 100644
--- a/ibus-HEAD.patch
+++ b/ibus-HEAD.patch
@@ -1179,3 +1179,30 @@ index f4b750a8..6d9422d5 100644
 -- 
 2.14.3
 
+From 886ad3651d16dd821e2526e8601c69738533a7e8 Mon Sep 17 00:00:00 2001
+From: fujiwarat <takao.fujiwara1@gmail.com>
+Date: Mon, 7 May 2018 12:35:03 +0900
+Subject: [PATCH] src: Fix SEGV in IBusEngine if no emoji shortcut keys
+
+BUG=https://github.com/ibus/ibus/issues/2005
+---
+ src/ibusengine.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/ibusengine.c b/src/ibusengine.c
+index 9a0b1a8a..fd61102a 100644
+--- a/src/ibusengine.c
++++ b/src/ibusengine.c
+@@ -925,6 +925,9 @@ ibus_engine_filter_key_event (IBusEngine *engine,
+     g_return_val_if_fail (IBUS_IS_ENGINE (engine), FALSE);
+ 
+     priv = engine->priv;
++    if (!priv->emoji_keybindings)
++        return FALSE;
++
+     modifiers = state & IBUS_MODIFIER_FILTER;
+     if (keyval >= IBUS_KEY_A && keyval <= IBUS_KEY_Z &&
+         (modifiers & IBUS_SHIFT_MASK) != 0) {
+-- 
+2.14.3
+

diff --git a/ibus.spec b/ibus.spec
index a400272..c573fde 100644
--- a/ibus.spec
+++ b/ibus.spec
@@ -452,9 +452,10 @@ dconf update || :
 %{_datadir}/gtk-doc/html/*
 
 %changelog
-* Fri Apr 13 2018 Takao Fujiwara <tfujiwar@redhat.com> - 1.5.18-5
+* Mon May 07 2018 Takao Fujiwara <tfujiwar@redhat.com> - 1.5.18-5
 - Disabled python2 since RHEL8
 - Run make check in %%check except for GUI testings
+- Fixed Bug 1574855 - [abrt] ibus: ibus_engine_filter_key_event()
 
 * Fri Mar 30 2018 Takao Fujiwara <tfujiwar@redhat.com> - 1.5.18-4
 - Fixed Bug 1554714 - improve order of unicode matches