From eac95df000aa5550d723ecedf12e6c24dc533045 Mon Sep 17 00:00:00 2001 From: hueychen27 Date: Sat, 7 Jun 2025 15:42:40 -0700 Subject: [PATCH] Replace qdbus with qdbus6 and kwalletd5 with kwalletd6 --- utils/keepassxc-kdewallet | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/utils/keepassxc-kdewallet b/utils/keepassxc-kdewallet index 109183c5c..80623fe1a 100755 --- a/utils/keepassxc-kdewallet +++ b/utils/keepassxc-kdewallet @@ -9,14 +9,14 @@ KEEPASSXC=$(which -a keepassxc | sed -e "\\,$0,d" -e 'q') daemon_main() { # open kdewallet - handle=$(qdbus org.kde.kwalletd5 /modules/kwalletd5 org.kde.KWallet.open kdewallet 0 "$PROG") - while [[ true != $(qdbus org.kde.kwalletd5 /modules/kwalletd5 org.kde.KWallet.isOpen kdewallet) ]]; do + handle=$(qdbus6 org.kde.kwalletd6 /modules/kwalletd6 open kdewallet 0 "$PROG") + while [[ true != $(qdbus6 org.kde.kwalletd6 /modules/kwalletd6 isOpen kdewallet) ]]; do sleep 1 done declare -A DBs for DBPATH in $(ls -r $KDBX_SEARCH); do - DBs[$(realpath $DBPATH)]=$(qdbus org.kde.kwalletd5 /modules/kwalletd5 org.kde.KWallet.readPassword "$handle" "Passwords" "${DBPATH##*/}" "$PROG") + DBs[$(realpath $DBPATH)]=$(qdbus6 org.kde.kwalletd6 /modules/kwalletd6 readPassword "$handle" "Passwords" "${DBPATH##*/}" "$PROG") done # launch real keepassxc @@ -24,7 +24,7 @@ daemon_main() { "$KEEPASSXC" --pw-stdin "${!DBs[@]}" <<<"${DBs[*]}" & # done with kdewallet - qdbus org.kde.kwalletd5 /modules/kwalletd5 org.kde.KWallet.close "$handle" "false" "$PROG" + qdbus6 org.kde.kwalletd6 /modules/kwalletd6 close "$handle" "false" "$PROG" } if [[ $1 == '-d' ]]; then