diff --git a/krunner/main.cpp b/krunner/main.cpp index 8154d429f..cf0ba494b 100644 --- a/krunner/main.cpp +++ b/krunner/main.cpp @@ -54,6 +54,10 @@ int main(int argc, char **argv) parser.addVersionOption(); parser.process(app); + if (!KAuthorized::authorize(QStringLiteral("run_command"))) { + return -1; + } + KDBusService service(KDBusService::Unique); KAboutData aboutData(QStringLiteral("krunner"), diff --git a/krunner/view.cpp b/krunner/view.cpp index 46671c106..b1bee9761 100644 --- a/krunner/view.cpp +++ b/krunner/view.cpp @@ -71,21 +71,19 @@ View::View(QWindow *) new AppAdaptor(this); QDBusConnection::sessionBus().registerObject(QStringLiteral("/App"), this); - if (KAuthorized::authorize(QStringLiteral("run_command"))) { - QAction *a = new QAction(0); - QObject::connect(a, &QAction::triggered, this, &View::displayOrHide); - a->setText(i18n("Run Command")); - a->setObjectName(QStringLiteral("run command")); - KGlobalAccel::self()->setDefaultShortcut(a, QList() << QKeySequence(Qt::ALT + Qt::Key_Space), KGlobalAccel::NoAutoloading); - KGlobalAccel::self()->setShortcut(a, QList() << QKeySequence(Qt::ALT + Qt::Key_Space) << QKeySequence(Qt::ALT + Qt::Key_F2) << Qt::Key_Search); - - a = new QAction(0); - QObject::connect(a, &QAction::triggered, this, &View::displayWithClipboardContents); - a->setText(i18n("Run Command on clipboard contents")); - a->setObjectName(QStringLiteral("run command on clipboard contents")); - KGlobalAccel::self()->setDefaultShortcut(a, QList() << QKeySequence(Qt::ALT+Qt::SHIFT+Qt::Key_F2)); - KGlobalAccel::self()->setShortcut(a, QList() << QKeySequence(Qt::ALT+Qt::SHIFT+Qt::Key_F2)); - } + QAction *a = new QAction(0); + QObject::connect(a, &QAction::triggered, this, &View::displayOrHide); + a->setText(i18n("Run Command")); + a->setObjectName(QStringLiteral("run command")); + KGlobalAccel::self()->setDefaultShortcut(a, QList() << QKeySequence(Qt::ALT + Qt::Key_Space), KGlobalAccel::NoAutoloading); + KGlobalAccel::self()->setShortcut(a, QList() << QKeySequence(Qt::ALT + Qt::Key_Space) << QKeySequence(Qt::ALT + Qt::Key_F2) << Qt::Key_Search); + + a = new QAction(0); + QObject::connect(a, &QAction::triggered, this, &View::displayWithClipboardContents); + a->setText(i18n("Run Command on clipboard contents")); + a->setObjectName(QStringLiteral("run command on clipboard contents")); + KGlobalAccel::self()->setDefaultShortcut(a, QList() << QKeySequence(Qt::ALT+Qt::SHIFT+Qt::Key_F2)); + KGlobalAccel::self()->setShortcut(a, QList() << QKeySequence(Qt::ALT+Qt::SHIFT+Qt::Key_F2)); m_qmlObj = new KDeclarative::QmlObject(this); m_qmlObj->setInitializationDelayed(true);