From 0de5d23864c67dcdbedae6ce996d41a3bb56ff86 Mon Sep 17 00:00:00 2001
From: "Aaron J. Seigo" <aseigo@kde.org>
Date: Tue, 28 Jul 2009 01:09:17 +0000
Subject: [PATCH] let the applet do the thinking about wether or not the config
 action is enabled CCBUG:201663

svn path=/trunk/KDE/kdelibs/; revision=1003317
---
 containment.cpp | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/containment.cpp b/containment.cpp
index be3905139..fba9ca333 100644
--- a/containment.cpp
+++ b/containment.cpp
@@ -577,14 +577,11 @@ void ContainmentPrivate::appletActions(KMenu &desktopMenu, Applet *applet, bool
         }
     }
 
-    if (applet->hasConfigurationInterface()) {
-        QAction *configureApplet = applet->d->actions->action("configure");
-        if (configureApplet) {
-            desktopMenu.addAction(configureApplet);
-        }
+    QAction *configureApplet = applet->d->actions->action("configure");
+    if (configureApplet && configureApplet->isEnabled()) {
+        desktopMenu.addAction(configureApplet);
     }
 
-
     if (static_cast<Corona*>(q->scene())->immutability() == Mutable) {
         if (!desktopMenu.isEmpty()) {
             desktopMenu.addSeparator();