From 97e82393ead51d55de85a445c6ec6b41fecd013b Mon Sep 17 00:00:00 2001
From: "Aaron J. Seigo" <aseigo@kde.org>
Date: Fri, 30 Apr 2010 02:11:11 +0000
Subject: [PATCH] cleanup

svn path=/trunk/KDE/kdelibs/; revision=1120901
---
 corona.cpp | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/corona.cpp b/corona.cpp
index 559719c5b..eeeb91bd5 100644
--- a/corona.cpp
+++ b/corona.cpp
@@ -195,13 +195,16 @@ public:
             pluginName = "desktop";
         }
 
-        if (pluginName != "null") {
+        bool loadingNull = pluginName == "null";
+        if (!loadingNull) {
             applet = Applet::load(pluginName, id, args);
             containment = dynamic_cast<Containment*>(applet);
         }
 
         if (!containment) {
-            kDebug() << "loading of containment" << name << "failed.";
+            if (!loadingNull) {
+                kDebug() << "loading of containment" << name << "failed.";
+            }
 
             // in case we got a non-Containment from Applet::loadApplet or
             // a null containment was requested
@@ -215,12 +218,13 @@ public:
             }
             applet = containment = new Containment(0, 0, id);
 
-            if (pluginName == "null") {
+            if (loadingNull) {
                 containment->setDrawWallpaper(false);
+            } else {
+                containment->setFailedToLaunch(false);
             }
 
             // we want to provide something and don't care about the failure to launch
-            containment->setFailedToLaunch(false);
             containment->setFormFactor(Plasma::Planar);
         }