From 25cc15a5a2097faad3d647c72bd4c2dadac3f7ef Mon Sep 17 00:00:00 2001 From: David Edmundson Date: Thu, 26 May 2016 13:51:23 +0100 Subject: [PATCH] Port all instances of Kauthorized action/shell_command to shell_command The KAuthorized key to prevent shell access according the documentation is simply "shell_action" not "action/shellAction" so should use authorize not authorizeKAction This appears to have come about as part of a porting bug when going from KApplication::authorize to KAuthorized in kdelibs3 to kdelibs4. To currently block shell access a sysadmin currently needs to have both keys set already, so we can be confident it won't have any actual compatibility problems. --- src/dolphinmainwindow.cpp | 4 ++-- src/dolphinpart.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp index 1fadaf7fd..3a06d2c0e 100644 --- a/src/dolphinmainwindow.cpp +++ b/src/dolphinmainwindow.cpp @@ -1099,7 +1099,7 @@ void DolphinMainWindow::setupActions() compareFiles->setEnabled(false); connect(compareFiles, &QAction::triggered, this, &DolphinMainWindow::compareFiles); - if (KAuthorized::authorizeKAction(QStringLiteral("shell_access"))) { + if (KAuthorized::authorize(QStringLiteral("shell_access"))) { QAction* openTerminal = actionCollection()->addAction(QStringLiteral("open_terminal")); openTerminal->setText(i18nc("@action:inmenu Tools", "Open Terminal")); openTerminal->setIcon(QIcon::fromTheme(QStringLiteral("utilities-terminal"))); @@ -1208,7 +1208,7 @@ void DolphinMainWindow::setupDockWidgets() // Setup "Terminal" #ifndef Q_OS_WIN - if (KAuthorized::authorizeKAction(QStringLiteral("shell_access"))) { + if (KAuthorized::authorize(QStringLiteral("shell_access"))) { DolphinDockWidget* terminalDock = new DolphinDockWidget(i18nc("@title:window Shell terminal", "Terminal")); terminalDock->setLocked(lock); terminalDock->setObjectName(QStringLiteral("terminalDock")); diff --git a/src/dolphinpart.cpp b/src/dolphinpart.cpp index f62bc5139..332f8e9b9 100644 --- a/src/dolphinpart.cpp +++ b/src/dolphinpart.cpp @@ -222,7 +222,7 @@ void DolphinPart::createActions() m_findFileAction->setIcon(QIcon::fromTheme(QStringLiteral("edit-find"))); connect(m_findFileAction, &QAction::triggered, this, &DolphinPart::slotFindFile); - if (KAuthorized::authorizeKAction(QStringLiteral("shell_access"))) { + if (KAuthorized::authorize(QStringLiteral("shell_access"))) { m_openTerminalAction = actionCollection()->addAction(QStringLiteral("open_terminal")); m_openTerminalAction->setIcon(QIcon::fromTheme(QStringLiteral("utilities-terminal"))); m_openTerminalAction->setText(i18nc("@action:inmenu Tools", "Open &Terminal")); -- 2.47.3