[rpms/ibus] autotool: Revise the previous Hangul patch

[rpms/ibus] autotool: Revise the previous Hangul patch

[Takao Fujiwara]

A new commit has been pushed.

Repo   : rpms/ibus
Branch : autotool
Commit : 591cda0fe28d44fc896c27c7ac1d2da84884df5e
Author : Takao Fujiwara <tfujiwar@redhat.com>
Date   : 2019-12-26T17:29:11+09:00
Stats  : +26/-23 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/ibus/c/591cda0fe28d44fc896c27c7ac1d2da84884df5e?branch=autotool

Log:
Revise the previous Hangul patch

---
diff --git a/ibus-HEAD.patch b/ibus-HEAD.patch
index 644bb67..01fbaa1 100644
--- a/ibus-HEAD.patch
+++ b/ibus-HEAD.patch
@@ -3027,9 +3027,9 @@ index 5e3457ba..ac5de809 100644
 -- 
 2.21.0
 
-From 0544e4b9c68c43d41c18c73b6e5a394fead1321a Mon Sep 17 00:00:00 2001
+From c662a02bf3b50914c697af12fc152ee97e2df961 Mon Sep 17 00:00:00 2001
 From: fujiwarat <takao.fujiwara1@gmail.com>
-Date: Tue, 24 Dec 2019 12:23:27 +0900
+Date: Wed, 25 Dec 2019 17:30:56 +0900
 Subject: [PATCH] client/gtk2: Fix to connect button-press-event signal
 
 IBus clients do not connect button-press-event in some conditions
@@ -3037,11 +3037,11 @@ and it will be fixed.
 
 BUG=https://github.com/ibus/ibus/issues/1980
 ---
- client/gtk2/ibusimcontext.c | 19 ++++++++++++++-----
- 1 file changed, 14 insertions(+), 5 deletions(-)
+ client/gtk2/ibusimcontext.c | 21 ++++++++++++---------
+ 1 file changed, 12 insertions(+), 9 deletions(-)
 
 diff --git a/client/gtk2/ibusimcontext.c b/client/gtk2/ibusimcontext.c
-index ac5de809..6b5ab04f 100644
+index ac5de809..30585403 100644
 --- a/client/gtk2/ibusimcontext.c
 +++ b/client/gtk2/ibusimcontext.c
 @@ -2,8 +2,8 @@
@@ -3089,35 +3089,35 @@ index ac5de809..6b5ab04f 100644
          }
      }
  }
-@@ -1180,6 +1186,8 @@ ibus_im_context_set_client_window (GtkIMContext *context, GdkWindow *client)
- #if !GTK_CHECK_VERSION (3, 93, 0)
-         if (ibusimcontext->use_button_press_event)
-             _connect_button_press_event (ibusimcontext, FALSE);
-+#else
-+        ibusimcontext->use_button_press_event = TRUE;
- #endif
-         g_object_unref (ibusimcontext->client_window);
-         ibusimcontext->client_window = NULL;
-@@ -1188,8 +1196,10 @@ ibus_im_context_set_client_window (GtkIMContext *context, GdkWindow *client)
+@@ -1188,7 +1194,7 @@ ibus_im_context_set_client_window (GtkIMContext *context, GdkWindow *client)
      if (client != NULL) {
          ibusimcontext->client_window = g_object_ref (client);
  #if !GTK_CHECK_VERSION (3, 93, 0)
 -        if (ibusimcontext->use_button_press_event)
 +        if (!ibusimcontext->use_button_press_event)
              _connect_button_press_event (ibusimcontext, TRUE);
-+#else
-+        ibusimcontext->use_button_press_event = FALSE;
  #endif
      }
-     if (ibusimcontext->slave)
-@@ -1660,7 +1670,6 @@ _ibus_context_update_preedit_text_cb (IBusInputContext  *ibuscontext,
- #if !GTK_CHECK_VERSION (3, 93, 0)
+@@ -1655,17 +1661,14 @@ _ibus_context_update_preedit_text_cb (IBusInputContext  *ibuscontext,
+         ibusimcontext->preedit_attrs = NULL;
+     }
+ 
++#if !GTK_CHECK_VERSION (3, 93, 0)
+     if (!ibusimcontext->use_button_press_event &&
+         mode == IBUS_ENGINE_PREEDIT_COMMIT) {
+-#if !GTK_CHECK_VERSION (3, 93, 0)
          if (ibusimcontext->client_window) {
              _connect_button_press_event (ibusimcontext, TRUE);
 -            ibusimcontext->use_button_press_event = TRUE;
          }
- #else
-         ibusimcontext->use_button_press_event = TRUE;
+-#else
+-        ibusimcontext->use_button_press_event = TRUE;
+-#endif
+     }
++#endif
+ 
+     str = text->text;
+     ibusimcontext->preedit_string = g_strdup (str);
 -- 
 2.21.0
 

diff --git a/ibus.spec b/ibus.spec
index fa8d42f..c85273d 100644
--- a/ibus.spec
+++ b/ibus.spec
@@ -35,7 +35,7 @@
 
 Name:           ibus
 Version:        1.5.21
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Intelligent Input Bus for Linux OS
 License:        LGPLv2+
 URL:            https://github.com/ibus/%name/wiki
@@ -464,6 +464,9 @@ dconf update || :
 %{_datadir}/installed-tests/ibus
 
 %changelog
+* Thu Dec 26 2019 Takao Fujiwara <tfujiwar@redhat.com> - 1.5.21-7
+- Revise the previous Hangul patch
+
 * Tue Dec 24 2019 Takao Fujiwara <tfujiwar@redhat.com> - 1.5.21-6
 - Fix to connect button-press-event for Hangul
 - Delete a previous workaround targeted to firefox only for Hangul