From a825be67e9a1b1042e8416264b86d21fb7c15079 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Fri, 5 Jul 2019 01:02:17 +0000 Subject: [PATCH] generic: adjust to Katie changes Signed-off-by: Ivailo Monev --- kglobalaccel/kglobalacceld.cpp | 2 +- kglobalaccel/kglobalacceld.h | 2 +- kwalletd/kwalletd.cpp | 6 ++++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/kglobalaccel/kglobalacceld.cpp b/kglobalaccel/kglobalacceld.cpp index a836344a..ae1689c4 100644 --- a/kglobalaccel/kglobalacceld.cpp +++ b/kglobalaccel/kglobalacceld.cpp @@ -461,7 +461,7 @@ void KGlobalAccelD::doRegister(const QStringList &actionId) } -QDBusObjectPath KGlobalAccelD::getComponent(const QString &componentUnique) const +QDBusObjectPath KGlobalAccelD::getComponent(const QString &componentUnique) { #ifdef KDEDGLOBALACCEL_TRACE kDebug() << componentUnique; diff --git a/kglobalaccel/kglobalacceld.h b/kglobalaccel/kglobalacceld.h index c9b1f9b6..db2cfae5 100644 --- a/kglobalaccel/kglobalacceld.h +++ b/kglobalaccel/kglobalacceld.h @@ -83,7 +83,7 @@ public Q_SLOTS: * * @return the absolute dbus path */ - Q_SCRIPTABLE QDBusObjectPath getComponent(const QString &componentUnique) const; + Q_SCRIPTABLE QDBusObjectPath getComponent(const QString &componentUnique); //to be called by main components owning the action Q_SCRIPTABLE QList setShortcut(const QStringList &actionId, diff --git a/kwalletd/kwalletd.cpp b/kwalletd/kwalletd.cpp index f759bbc2..58a8d5a5 100644 --- a/kwalletd/kwalletd.cpp +++ b/kwalletd/kwalletd.cpp @@ -298,8 +298,9 @@ int KWalletD::open(const QString& wallet, qlonglong wId, const QString& appid) { KWalletTransaction *xact = new KWalletTransaction(connection()); _transactions.append(xact); - message().setDelayedReply(true); + // message().setDelayedReply(true); xact->message = message(); + xact->message.setDelayedReply(true); xact->appid = appid; xact->wallet = wallet; @@ -791,8 +792,9 @@ int KWalletD::deleteWallet(const QString& wallet) { void KWalletD::changePassword(const QString& wallet, qlonglong wId, const QString& appid) { KWalletTransaction *xact = new KWalletTransaction(connection()); - message().setDelayedReply(true); + // message().setDelayedReply(true); xact->message = message(); + xact->message.setDelayedReply(true); // TODO GPG this shouldn't be allowed on a GPG managed wallet; a warning should be displayed about this xact->appid = appid;