From e5d4c88733ad87c633ab6cfdb33fbca132145331 Mon Sep 17 00:00:00 2001 From: Takao Fujiwara Date: Wed, 12 Dec 2018 16:16:43 +0900 Subject: [PATCH] Fix SEGV on mouse clicks when ibus-daemon not running --- ibus-HEAD.patch | 30 ++++++++++++++++++++++++++++++ ibus.spec | 5 ++++- 2 files changed, 34 insertions(+), 1 deletion(-) diff --git a/ibus-HEAD.patch b/ibus-HEAD.patch index 5a14514..893438b 100644 --- a/ibus-HEAD.patch +++ b/ibus-HEAD.patch @@ -2020,3 +2020,33 @@ index ba9d92b6..7615f121 100644 -- 2.19.1 +From c7d8771cb9fc652cb638aa7cb8e10ea6b889509e Mon Sep 17 00:00:00 2001 +From: fujiwarat +Date: Tue, 11 Dec 2018 19:16:10 +0900 +Subject: [PATCH] client/gtk2: Fix SEGV on mouse clicks when ibus-daemon not + running + +--- + client/gtk2/ibusimcontext.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/client/gtk2/ibusimcontext.c b/client/gtk2/ibusimcontext.c +index ed7fea6e..ab7ff88a 100644 +--- a/client/gtk2/ibusimcontext.c ++++ b/client/gtk2/ibusimcontext.c +@@ -1117,9 +1117,10 @@ ibus_im_context_button_press_event_cb (GtkWidget *widget, + if (event->button != 1) + return FALSE; + +- ibus_im_context_clear_preedit_text (ibusimcontext); +- if (ibusimcontext->ibuscontext) ++ if (ibusimcontext->ibuscontext) { ++ ibus_im_context_clear_preedit_text (ibusimcontext); + ibus_input_context_reset (ibusimcontext->ibuscontext); ++ } + return FALSE; + } + +-- +2.19.1 + diff --git a/ibus.spec b/ibus.spec index e923969..6ca8fc1 100644 --- a/ibus.spec +++ b/ibus.spec @@ -35,7 +35,7 @@ Name: ibus Version: 1.5.19 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Intelligent Input Bus for Linux OS License: LGPLv2+ Group: System Environment/Libraries @@ -436,6 +436,9 @@ dconf update || : %{_datadir}/gtk-doc/html/* %changelog +* Wed Dec 12 2018 Takao Fujiwara - 1.5.19-11 +- Fix SEGV on mouse clicks when ibus-daemon not running + * Mon Dec 10 2018 Takao Fujiwara - 1.5.19-10 - Always reset and clear preedit on mouse click - Show compose preedit with custom compose file