From 107173a80e3d6051afd4ef15ca3b0ba2fc678519 Mon Sep 17 00:00:00 2001
From: Chani Armitage <chanika@gmail.com>
Date: Sun, 25 Jan 2009 04:24:22 +0000
Subject: [PATCH] disable the settings action when it's darn well supposed to
 be disabled

svn path=/branches/KDE/4.2/kdelibs/; revision=916332
---
 containment.cpp | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/containment.cpp b/containment.cpp
index e39854205..c79736d98 100644
--- a/containment.cpp
+++ b/containment.cpp
@@ -1602,12 +1602,10 @@ void ContainmentPrivate::containmentConstraintsEvent(Plasma::Constraints constra
         }
 
         bool canConfig = unlocked || KAuthorized::authorize("PlasmaAllowConfigureWhenLocked");
-        if (canConfig) {
-            action = actions().action("activity settings");
-            if (action) {
-                action->setVisible(canConfig);
-                action->setEnabled(canConfig);
-            }
+        action = actions().action("activity settings");
+        if (action) {
+            action->setVisible(canConfig);
+            action->setEnabled(canConfig);
         }
 
         // tell the applets too