From 321c298a96418899459842699d53ee3b56987cd6 Mon Sep 17 00:00:00 2001 From: "Aaron J. Seigo" Date: Wed, 6 Jan 2010 04:16:28 +0000 Subject: [PATCH] standarize the authorization restrictions with other ones found in KDE; one of these is new in 4.4 and neither of the other two were ever documented anywhere svn path=/trunk/KDE/kdelibs/; revision=1070582 --- applet.cpp | 2 +- containment.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/applet.cpp b/applet.cpp index 410343f94..10af395fc 100644 --- a/applet.cpp +++ b/applet.cpp @@ -1169,7 +1169,7 @@ void Applet::flushPendingConstraintsEvents() connect(configAction, SIGNAL(triggered(bool)), this, SLOT(showConfigurationInterface())); } - bool canConfig = unlocked || KAuthorized::authorize("PlasmaAllowConfigureWhenLocked"); + bool canConfig = unlocked || KAuthorized::authorize("plasma/allow_configure_when_locked"); configAction->setVisible(canConfig); configAction->setEnabled(canConfig); } diff --git a/containment.cpp b/containment.cpp index e1c4931f8..37d9388c4 100644 --- a/containment.cpp +++ b/containment.cpp @@ -624,7 +624,7 @@ void Containment::showContextMenu(const QPointF &containmentPos, const QPoint &s void Containment::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) { //kDebug() << "let's see if we manage to get a context menu here, huh"; - if (!isContainment() || !scene() || !KAuthorized::authorizeKAction("desktop_contextmenu")) { + if (!isContainment() || !scene() || !KAuthorized::authorizeKAction("plasma/containment_context_menu")) { Applet::contextMenuEvent(event); return; } @@ -640,7 +640,7 @@ void Containment::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) void ContainmentPrivate::containmentActions(KMenu &desktopMenu) { if (static_cast(q->scene())->immutability() != Mutable && - !KAuthorized::authorizeKAction("unlock_desktop")) { + !KAuthorized::authorizeKAction("plasma/containment_actions")) { //kDebug() << "immutability"; return; }