[rpms/ibus] autotool: Keep preedit cursor_pos and visible in clearing preedit text for Hangul

[rpms/ibus] autotool: Keep preedit cursor_pos and visible in clearing preedit text for Hangul

[Takao Fujiwara]

A new commit has been pushed.

Repo   : rpms/ibus
Branch : autotool
Commit : e63bfb407aefa474286e901d28e90e6c9096b14b
Author : Takao Fujiwara <tfujiwar@redhat.com>
Date   : 2019-05-13T13:16:06+09:00
Stats  : +50/-3 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/ibus/c/e63bfb407aefa474286e901d28e90e6c9096b14b?branch=autotool

Log:
Keep preedit cursor_pos and visible in clearing preedit text for Hangul

---
diff --git a/ibus-HEAD.patch b/ibus-HEAD.patch
index 10833dc..d54c1a8 100644
--- a/ibus-HEAD.patch
+++ b/ibus-HEAD.patch
@@ -1,6 +1,6 @@
-From 49c4fdd0a30d07fe1ba73644aca44a4732c03e1f Mon Sep 17 00:00:00 2001
+From 05a10950d635602fb3fcf4ed0021aa0b15dbd698 Mon Sep 17 00:00:00 2001
 From: fujiwarat <takao.fujiwara1@gmail.com>
-Date: Wed, 27 Feb 2019 19:45:06 +0900
+Date: Thu, 9 May 2019 15:49:09 +0900
 Subject: [PATCH] src: Make ISO 639 language names with title
 
 Danish translations are small in iso-codes-iso-639-2-da.po for the
@@ -333,3 +333,47 @@ index 00000000..5a73798b
 -- 
 2.20.1
 
+From cebe7a9553de69943b955ec99285f74961c9ee4e Mon Sep 17 00:00:00 2001
+From: fujiwarat <takao.fujiwara1@gmail.com>
+Date: Thu, 9 May 2019 15:49:21 +0900
+Subject: [PATCH] client/gtk2: Keep preedit cursor_pos and visible in clearing
+ preedit text
+
+Clear the preedit_string but keep the preedit_cursor_pos and
+preedit_visible because a time lag could happen, firefox commit
+the preedit text before the preedit text is cleared and it cause
+a double commits of the Hangul preedit in firefox if the preedit
+would be located on the URL bar and click on anywhere of firefox
+out of the URL bar.
+---
+ client/gtk2/ibusimcontext.c | 12 ++++++++++--
+ 1 file changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/client/gtk2/ibusimcontext.c b/client/gtk2/ibusimcontext.c
+index 264a747a..5e3457ba 100644
+--- a/client/gtk2/ibusimcontext.c
++++ b/client/gtk2/ibusimcontext.c
+@@ -881,10 +881,18 @@ ibus_im_context_clear_preedit_text (IBusIMContext *ibusimcontext)
+         ibusimcontext->preedit_mode == IBUS_ENGINE_PREEDIT_COMMIT) {
+         preedit_string = g_strdup (ibusimcontext->preedit_string);
+     }
++
++    /* Clear the preedit_string but keep the preedit_cursor_pos and
++     * preedit_visible because a time lag could happen, firefox commit
++     * the preedit text before the preedit text is cleared and it cause
++     * a double commits of the Hangul preedit in firefox if the preedit
++     * would be located on the URL bar and click on anywhere of firefox
++     * out of the URL bar.
++     */
+     _ibus_context_update_preedit_text_cb (ibusimcontext->ibuscontext,
+                                           ibus_text_new_from_string (""),
+-                                          0,
+-                                          FALSE,
++                                          ibusimcontext->preedit_cursor_pos,
++                                          ibusimcontext->preedit_visible,
+                                           IBUS_ENGINE_PREEDIT_CLEAR,
+                                           ibusimcontext);
+     if (preedit_string) {
+-- 
+2.20.1
+

diff --git a/ibus.spec b/ibus.spec
index a38fac7..206f3c9 100644
--- a/ibus.spec
+++ b/ibus.spec
@@ -35,7 +35,7 @@
 
 Name:           ibus
 Version:        1.5.20
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Intelligent Input Bus for Linux OS
 License:        LGPLv2+
 URL:            https://github.com/ibus/%name/wiki
@@ -435,6 +435,9 @@ dconf update || :
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Mon May 13 2019 Takao Fujiwara <tfujiwar@redhat.com> - 1.5.20-4
+- Keep preedit cursor_pos and visible in clearing preedit text for Hangul
+
 * Tue Apr 23 2019 Takao Fujiwara <tfujiwar@redhat.com> - 1.5.20-3
 - Fix i18n ibus-setup
 - Provide ibus.its