Fix boo#1255237: $XDG_CONFIG_DIRS/plasma-workspace/env stop working #2

Manually merged
dimstar_suse merged 2 commits from ftake/fcitx5:leap-16.0 into leap-16.0 2026-01-15 18:41:38 +01:00
2 changed files with 10 additions and 3 deletions

View File

@@ -10,12 +10,12 @@ desktop_file="/usr/share/applications/org.fcitx.Fcitx5.desktop"
# Do nothing for X11 session
if [ "$XDG_SESSION_TYPE" != "wayland" ]; then
exit 0
return 0
fi
# Do nothing if kreadconfig6 is not available
if ! command -v kreadconfig6 >/dev/null 2>&1; then
exit 0
return 0
fi
# check current virtual keyboard
@@ -35,7 +35,7 @@ if [ ! -e "$stamp_file" ]; then
# check current virtual keyboard is None
if [ -z "$current_im" ]; then
# The virtual keyboard is not configured
echo "$0 is configuring the virtual keyboard for IBus."
echo "$0 is configuring the virtual keyboard for Fcitx."
current_im=$desktop_file
kwriteconfig6 --file kwinrc --group Wayland --key InputMethod $current_im
else

View File

@@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Dec 17 15:30:13 UTC 2025 - Fuminobu Takeyama <ftake@geeko.jp>
- Use return instead of exit in 20-fcitx-plasma-setup.sh
* Fix boo#1255237
- Replace "IBus" with "Fcitx" in a log message
-------------------------------------------------------------------
Mon Sep 15 13:40:18 UTC 2025 - Fuminobu Takeyama <ftake@geeko.jp>