From 86c4b6caf52b64a05ffd3848362b9e80af07d889 Mon Sep 17 00:00:00 2001 From: niushijia Date: Tue, 29 Apr 2025 09:23:46 +0800 Subject: [PATCH 1/2] feat:block the diagnostic prompt messages in the UKUI desktop environment --- src/modules/wayland/waylandmodule.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/modules/wayland/waylandmodule.cpp b/src/modules/wayland/waylandmodule.cpp index 8595defb..5b2f3e0a 100644 --- a/src/modules/wayland/waylandmodule.cpp +++ b/src/modules/wayland/waylandmodule.cpp @@ -634,6 +634,14 @@ void WaylandModule::selfDiagnose() { "see " "https://fcitx-im.org/wiki/Using_Fcitx_5_on_Wayland#GNOME")); } + } else if(desktop == DesktopType::UKUI) { + // The prompt messages are not displayed in the UKUI desktop environment. + FCITX_INFO() << __func__ << ",desktop type is UKUI"; + if (!isWaylandIM) { + FCITX_INFO() << "isWaylandIM:" << isWaylandIM; + } else if (!gtkIM.empty() || !qtIM.empty()) { + FCITX_INFO() << "gtkIM or qtIM not empty"; + } } else { // It is not clear whether compositor is supported, only warn if wayland // im is being used.. -- Gitee From 9cf280035a798c11ab233c93ccc9df7d102349ad Mon Sep 17 00:00:00 2001 From: niushijia Date: Tue, 29 Apr 2025 15:54:30 +0800 Subject: [PATCH 2/2] update changelog --- debian/changelog | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/debian/changelog b/debian/changelog index b8407e8e..bfc28d28 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +fcitx5 (5.1.12-ok0.4) huanghe; urgency=medium + + * BUG：#346566 【版本组自测】【输入法】v11版本开机fcitx存在wayland环境检查弹窗 + * 需求号：无 + * 其他改动说明：判断桌面环境类型为UKUI时，不再发送诊断消息，只输出日志 + * 其他改动影响域：无 + + -- niushijia Tue, 29 Apr 2025 15:50:36 +0800 + fcitx5 (5.1.12-ok0.3) huanghe; urgency=medium * BUG：无 -- Gitee