Minor improvements

Author: alex1701c

CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.8.12)
 
 project(KWalletRunner)
 
-set(KF5_VERSION "5.24.0")
+set(KF5_VERSION "5.44.0")
 find_package(ECM ${KF5_VERSION} REQUIRED NO_MODULE)
 set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
 

src/kwalletrunner.cpp

@@ -23,7 +23,6 @@ KWalletRunner::KWalletRunner(QObject *parent, const QVariantList &args) :
 
     // Open the wallet
     wallet = Wallet::openWallet(Wallet::LocalWallet(), 0, Wallet::Synchronous);
-    validWallet = Wallet::isEnabled() && wallet;
 
     auto *overview = addAction(QStringLiteral("overview"),
                                QIcon::fromTheme(QStringLiteral("documentinfo")),
@@ -35,20 +34,22 @@ KWalletRunner::KWalletRunner(QObject *parent, const QVariantList &args) :
     edit->setData(QStringLiteral("edit"));
     actions = {overview, edit};
 
+    const bool validWallet = Wallet::isEnabled() && wallet;
     if (!validWallet || !wallet->isOpen()) {
         KNotification::event(KNotification::Error,
                              QStringLiteral("KWallet"),
                              QStringLiteral("Could not open KWallet!"),
                              QStringLiteral("kwallet"));
     }
+    matchingSuspended(!validWallet);
 }
 
 KWalletRunner::~KWalletRunner() {
     delete wallet;
 }
 
 void KWalletRunner::match(Plasma::RunnerContext &context) {
-    if (!validWallet || !context.isValid() || !wallet->isOpen()) {
+    if (!context.isValid() || !wallet->isOpen()) {
         return;
     }
 
@@ -117,7 +118,7 @@ void KWalletRunner::run(const Plasma::RunnerContext &context, const Plasma::Quer
                 return;
             }
         }
-        QTimer::singleShot(0, data, [data]() {
+        QTimer::singleShot(0, [data]() {
             EditDialog addDialog;
             addDialog.init(data);
             addDialog.exec();
@@ -166,7 +167,7 @@ QList<QAction *> KWalletRunner::actionsForMatch(const Plasma::QueryMatch &match)
 void KWalletRunner::setClipboardPassword(const QString &password) {
     QClipboard *cb = QApplication::clipboard();
     cb->setText(password);
-    QTimer::singleShot(5000, cb, [cb]() {
+    QTimer::singleShot(5000, [cb]() {
         // Clipboard managers might cause the clear function to not work properly
         cb->setText(QString());
     });

src/kwalletrunner.h

@@ -33,7 +33,6 @@ Q_OBJECT
     const QLatin1String defaultMatchId = QLatin1String("kwalletrunner");
     const QRegularExpression addRegex = QRegularExpression(QStringLiteral("^kwallet-add ?"));
     const QRegularExpression shortAddRegex = QRegularExpression(QStringLiteral("^kwl-add ?"));
-    bool validWallet;
 };
 
 #endif /* KWALLETRUNNER_H */

src/plasma-runner-kwallet.desktop

@@ -73,6 +73,6 @@ X-KDE-Library=krunner_kwallet
 X-KDE-PluginInfo-Author=alex1701c
 X-KDE-PluginInfo-Email=alex1701c.dev@gmx.net
 X-KDE-PluginInfo-Name=kwalletrunner
-X-KDE-PluginInfo-Version=0.1
+X-KDE-PluginInfo-Version=1.0.0
 X-KDE-PluginInfo-License=GPL
 X-KDE-PluginInfo-EnabledByDefault=true