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

Resolves: #2088656 Revise XKB engine panel menu in Plasma Wayland

Browse Source
This commit is contained in:
Takao Fujiwara 2022-06-11 21:30:39 +09:00
parent 9da0396a49
commit 78fef05454
2 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ibus-HEAD.patch
View File

@ -1094,9 +1094,9 @@ index f8dced6b..92464234 100755
-- --
2.35.3 2.35.3
From 85b381d531b8fc319e627a5e9d4b815f34a50e2f Mon Sep 17 00:00:00 2001 From 59d9401da254c0152c313f9027457eb234a23a8c Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com> From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Thu, 2 Jun 2022 16:47:10 +0900 Date: Sat, 11 Jun 2022 21:10:12 +0900
Subject: [PATCH] ui/gtk3: Hide XKB engine but enable it in Plasma Wayland Subject: [PATCH] ui/gtk3: Hide XKB engine but enable it in Plasma Wayland
IBus just cannot forward key events in Plasma Wayland because IBus just cannot forward key events in Plasma Wayland because
@ -1104,11 +1104,11 @@ IBus has to handle the compose keys.
BUG=rhbz#2088656 BUG=rhbz#2088656
--- ---
ui/gtk3/panel.vala | 46 +++++++++++++++++++++++++++++----------------- ui/gtk3/panel.vala | 50 ++++++++++++++++++++++++++++++----------------
1 file changed, 29 insertions(+), 17 deletions(-) 1 file changed, 33 insertions(+), 17 deletions(-)
diff --git a/ui/gtk3/panel.vala b/ui/gtk3/panel.vala diff --git a/ui/gtk3/panel.vala b/ui/gtk3/panel.vala
index 61bfa1b6..900f0168 100644 index 61bfa1b6..28a1aa0b 100644
--- a/ui/gtk3/panel.vala --- a/ui/gtk3/panel.vala
+++ b/ui/gtk3/panel.vala +++ b/ui/gtk3/panel.vala
@@ -41,6 +41,7 @@ class Panel : IBus.PanelService { @@ -41,6 +41,7 @@ class Panel : IBus.PanelService {
@ -1201,7 +1201,18 @@ index 61bfa1b6..900f0168 100644
} else { } else {
var current_engine = m_engines[0]; var current_engine = m_engines[0];
m_engines = engines; m_engines = engines;
@@ -1566,7 +1578,7 @@ class Panel : IBus.PanelService { @@ -1289,6 +1301,10 @@ class Panel : IBus.PanelService {
var longname = engine.get_longname();
var textdomain = engine.get_textdomain();
var transname = GLib.dgettext(textdomain, longname);
+ if (m_is_wayland && engine.get_name().has_prefix("xkb:")) {
+ language = _("Other");
+ transname = _("No input method");
+ }
var item = new Gtk.MenuItem.with_label(
"%s - %s".printf (IBus.get_language_name(language), transname));
// Make a copy of engine to workaround a bug in vala.
@@ -1566,7 +1582,7 @@ class Panel : IBus.PanelService {
if (engine != null) { if (engine != null) {
var name = engine.get_name(); var name = engine.get_name();

5
ibus.spec
View File

@ -39,7 +39,7 @@
Name: ibus Name: ibus
Version: 1.5.26 Version: 1.5.26
Release: 8%{?dist} Release: 9%{?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
@ -522,6 +522,9 @@ dconf update || :
%{_datadir}/installed-tests/ibus %{_datadir}/installed-tests/ibus
%changelog %changelog
* Sat Jun 11 2022 Takao Fujiwara <tfujiwar@redhat.com> - 1.5.26-9
- Resolves: #2088656 Revise XKB engine panel menu in Plasma Wayland
* Thu Jun 02 2022 Takao Fujiwara <tfujiwar@redhat.com> - 1.5.26-8 * Thu Jun 02 2022 Takao Fujiwara <tfujiwar@redhat.com> - 1.5.26-8
- Resolves: #2088656 Hide XKB engine but enable it in Plasma Wayland - Resolves: #2088656 Hide XKB engine but enable it in Plasma Wayland