mirror of
https://invent.kde.org/system/dolphin
synced 2024-09-19 00:11:21 +00:00
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.
This commit is contained in:
parent
b1471bbd09
commit
25cc15a5a2
|
@ -1099,7 +1099,7 @@ void DolphinMainWindow::setupActions()
|
||||||
compareFiles->setEnabled(false);
|
compareFiles->setEnabled(false);
|
||||||
connect(compareFiles, &QAction::triggered, this, &DolphinMainWindow::compareFiles);
|
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"));
|
QAction* openTerminal = actionCollection()->addAction(QStringLiteral("open_terminal"));
|
||||||
openTerminal->setText(i18nc("@action:inmenu Tools", "Open Terminal"));
|
openTerminal->setText(i18nc("@action:inmenu Tools", "Open Terminal"));
|
||||||
openTerminal->setIcon(QIcon::fromTheme(QStringLiteral("utilities-terminal")));
|
openTerminal->setIcon(QIcon::fromTheme(QStringLiteral("utilities-terminal")));
|
||||||
|
@ -1208,7 +1208,7 @@ void DolphinMainWindow::setupDockWidgets()
|
||||||
|
|
||||||
// Setup "Terminal"
|
// Setup "Terminal"
|
||||||
#ifndef Q_OS_WIN
|
#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"));
|
DolphinDockWidget* terminalDock = new DolphinDockWidget(i18nc("@title:window Shell terminal", "Terminal"));
|
||||||
terminalDock->setLocked(lock);
|
terminalDock->setLocked(lock);
|
||||||
terminalDock->setObjectName(QStringLiteral("terminalDock"));
|
terminalDock->setObjectName(QStringLiteral("terminalDock"));
|
||||||
|
|
|
@ -222,7 +222,7 @@ void DolphinPart::createActions()
|
||||||
m_findFileAction->setIcon(QIcon::fromTheme(QStringLiteral("edit-find")));
|
m_findFileAction->setIcon(QIcon::fromTheme(QStringLiteral("edit-find")));
|
||||||
connect(m_findFileAction, &QAction::triggered, this, &DolphinPart::slotFindFile);
|
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 = actionCollection()->addAction(QStringLiteral("open_terminal"));
|
||||||
m_openTerminalAction->setIcon(QIcon::fromTheme(QStringLiteral("utilities-terminal")));
|
m_openTerminalAction->setIcon(QIcon::fromTheme(QStringLiteral("utilities-terminal")));
|
||||||
m_openTerminalAction->setText(i18nc("@action:inmenu Tools", "Open &Terminal"));
|
m_openTerminalAction->setText(i18nc("@action:inmenu Tools", "Open &Terminal"));
|
||||||
|
|
Loading…
Reference in a new issue