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

cleanup

Browse Source 
svn path=/trunk/KDE/kdelibs/; revision=1120901
This commit is contained in:
Aaron J. Seigo 2010-04-30 02:11:11 +00:00
parent 839204b6ea
commit 97e82393ea
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
corona.cpp
View File

@ -195,13 +195,16 @@ public:
pluginName = "desktop"; pluginName = "desktop";
} }
if (pluginName != "null") { bool loadingNull = pluginName == "null";
if (!loadingNull) {
applet = Applet::load(pluginName, id, args); applet = Applet::load(pluginName, id, args);
containment = dynamic_cast<Containment*>(applet); containment = dynamic_cast<Containment*>(applet);
} }
if (!containment) { 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 // in case we got a non-Containment from Applet::loadApplet or
// a null containment was requested // a null containment was requested
@ -215,12 +218,13 @@ public:
} }
applet = containment = new Containment(0, 0, id); applet = containment = new Containment(0, 0, id);
if (pluginName == "null") { if (loadingNull) {
containment->setDrawWallpaper(false); containment->setDrawWallpaper(false);
} else {
containment->setFailedToLaunch(false);
} }
// we want to provide something and don't care about the failure to launch // we want to provide something and don't care about the failure to launch
containment->setFailedToLaunch(false);
containment->setFormFactor(Plasma::Planar); containment->setFormFactor(Plasma::Planar);
} }