rpms/ibus
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Revise the previous Hangul patch

Browse Source
This commit is contained in:
Takao Fujiwara 2019-12-26 17:29:11 +09:00
parent 9f9e09d31a
commit 591cda0fe2
2 changed files with 26 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
ibus-HEAD.patch
View File

@ -3027,9 +3027,9 @@ index 5e3457ba..ac5de809 100644
-- --
2.21.0 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> 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 Subject: [PATCH] client/gtk2: Fix to connect button-press-event signal
IBus clients do not connect button-press-event in some conditions 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 BUG=https://github.com/ibus/ibus/issues/1980
--- ---
client/gtk2/ibusimcontext.c | 19 ++++++++++++++----- client/gtk2/ibusimcontext.c | 21 ++++++++++++---------
1 file changed, 14 insertions(+), 5 deletions(-) 1 file changed, 12 insertions(+), 9 deletions(-)
diff --git a/client/gtk2/ibusimcontext.c b/client/gtk2/ibusimcontext.c 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 --- a/client/gtk2/ibusimcontext.c
+++ b/client/gtk2/ibusimcontext.c +++ b/client/gtk2/ibusimcontext.c
@@ -2,8 +2,8 @@ @@ -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) @@ -1188,7 +1194,7 @@ 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)
if (client != NULL) { if (client != NULL) {
ibusimcontext->client_window = g_object_ref (client); ibusimcontext->client_window = g_object_ref (client);
#if !GTK_CHECK_VERSION (3, 93, 0) #if !GTK_CHECK_VERSION (3, 93, 0)
- if (ibusimcontext->use_button_press_event) - if (ibusimcontext->use_button_press_event)
+ if (!ibusimcontext->use_button_press_event) + if (!ibusimcontext->use_button_press_event)
_connect_button_press_event (ibusimcontext, TRUE); _connect_button_press_event (ibusimcontext, TRUE);
+#else
+ ibusimcontext->use_button_press_event = FALSE;
#endif #endif
} }
if (ibusimcontext->slave) @@ -1655,17 +1661,14 @@ _ibus_context_update_preedit_text_cb (IBusInputContext *ibuscontext,
@@ -1660,7 +1670,6 @@ _ibus_context_update_preedit_text_cb (IBusInputContext *ibuscontext, ibusimcontext->preedit_attrs = NULL;
#if !GTK_CHECK_VERSION (3, 93, 0) }
+#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) { if (ibusimcontext->client_window) {
_connect_button_press_event (ibusimcontext, TRUE); _connect_button_press_event (ibusimcontext, TRUE);
- ibusimcontext->use_button_press_event = TRUE; - ibusimcontext->use_button_press_event = TRUE;
} }
#else -#else
ibusimcontext->use_button_press_event = TRUE; - ibusimcontext->use_button_press_event = TRUE;
-#endif
}
+#endif
str = text->text;
ibusimcontext->preedit_string = g_strdup (str);
-- --
2.21.0 2.21.0

5
ibus.spec
View File

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