respect "null" as a containment request: no wallpaper
svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=858909
This commit is contained in:
parent
81ff908a3e
commit
4ae5e8bdf7
@ -1184,8 +1184,9 @@ void Containment::setDrawWallpaper(bool drawWallpaper)
|
||||
d->drawWallpaper = drawWallpaper;
|
||||
if (d->drawWallpaper) {
|
||||
KConfigGroup cfg = config();
|
||||
setWallpaper(cfg.readEntry("wallpaperplugin", defaultWallpaper),
|
||||
cfg.readEntry("wallpaperpluginmode", defaultWallpaperMode));
|
||||
QString wallpaper = cfg.readEntry("wallpaperplugin", defaultWallpaper);
|
||||
QString mode = cfg.readEntry("wallpaperpluginmode", defaultWallpaperMode);
|
||||
setWallpaper(wallpaper, mode);
|
||||
} else if (!d->drawWallpaper && d->wallpaper) {
|
||||
delete d->wallpaper;
|
||||
d->wallpaper = 0;
|
||||
|
@ -495,6 +495,7 @@ class PLASMA_EXPORT Containment : public Applet
|
||||
Q_PRIVATE_SLOT(d, void toggleDesktopImmutability())
|
||||
|
||||
friend class Applet;
|
||||
friend class CoronaPrivate;
|
||||
friend class ContainmentPrivate;
|
||||
ContainmentPrivate* const d;
|
||||
};
|
||||
|
@ -136,6 +136,10 @@ public:
|
||||
delete applet;
|
||||
containment = new Containment(0, 0, id);
|
||||
|
||||
if (pluginName == "null") {
|
||||
containment->setDrawWallpaper(false);
|
||||
}
|
||||
|
||||
// we want to provide something and don't care about the failure to launch
|
||||
containment->setFailedToLaunch(false);
|
||||
containment->setFormFactor(Plasma::Planar);
|
||||
|
Loading…
Reference in New Issue
Block a user