Katana_mirror/kde-workspace
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kde-workspace.git synced 2025-02-23 18:32:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

generic: adjust to Katie changes

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
This commit is contained in:
Ivailo Monev 2019-07-05 01:02:17 +00:00
parent b8ebb65378
commit a825be67e9
3 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
kglobalaccel/kglobalacceld.cpp
View file

@ -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;

2
kglobalaccel/kglobalacceld.h
View file

@ -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<int> setShortcut(const QStringList &actionId,

6
kwalletd/kwalletd.cpp
View file

@ -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;