alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
svn path=/trunk/KDE/kdelibs/; revision=1070582
This commit is contained in:
Aaron J. Seigo 2010-01-06 04:16:28 +00:00
parent 46824ec1b1
commit 321c298a96
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
applet.cpp
View File

@ -1169,7 +1169,7 @@ void Applet::flushPendingConstraintsEvents()
connect(configAction, SIGNAL(triggered(bool)), this, SLOT(showConfigurationInterface())); 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->setVisible(canConfig);
configAction->setEnabled(canConfig); configAction->setEnabled(canConfig);
} }

4
containment.cpp
View File

@ -624,7 +624,7 @@ void Containment::showContextMenu(const QPointF &containmentPos, const QPoint &s
void Containment::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) void Containment::contextMenuEvent(QGraphicsSceneContextMenuEvent *event)
{ {
//kDebug() << "let's see if we manage to get a context menu here, huh"; //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); Applet::contextMenuEvent(event);
return; return;
} }
@ -640,7 +640,7 @@ void Containment::contextMenuEvent(QGraphicsSceneContextMenuEvent *event)
void ContainmentPrivate::containmentActions(KMenu &desktopMenu) void ContainmentPrivate::containmentActions(KMenu &desktopMenu)
{ {
if (static_cast<Corona*>(q->scene())->immutability() != Mutable && if (static_cast<Corona*>(q->scene())->immutability() != Mutable &&
!KAuthorized::authorizeKAction("unlock_desktop")) { !KAuthorized::authorizeKAction("plasma/containment_actions")) {
//kDebug() << "immutability"; //kDebug() << "immutability";
return; return;
} }