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

if the current wallpaper plugin supports the mimetype being dropped, offer that; otherwise look for something new

Browse Source 
svn path=/trunk/KDE/kdelibs/; revision=1217339
This commit is contained in:
Aaron J. Seigo 2011-01-26 20:09:18 +00:00
parent f721ef40fc
commit 1cbd777478
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
containment.cpp
View File

@ -71,6 +71,7 @@
#include "private/containmentactionspluginsconfig_p.h" #include "private/containmentactionspluginsconfig_p.h"
#include "private/extenderitemmimedata_p.h" #include "private/extenderitemmimedata_p.h"
#include "private/extenderapplet_p.h" #include "private/extenderapplet_p.h"
#include "private/wallpaper_p.h"
#include "plasma/plasma.h" #include "plasma/plasma.h"
#include "animations/animation.h" #include "animations/animation.h"
@ -1523,8 +1524,12 @@ void ContainmentPrivate::mimeTypeRetrieved(KIO::Job *job, const QString &mimetyp
appletList << Applet::listAppletInfoForMimetype(mimetype); appletList << Applet::listAppletInfoForMimetype(mimetype);
KPluginInfo::List wallpaperList; KPluginInfo::List wallpaperList;
if (q->drawWallpaper()) { if (q->drawWallpaper()) {
if (wallpaper && wallpaper->supportsMimetype(mimetype)) {
wallpaperList << wallpaper->d->wallpaperDescription;
} else {
wallpaperList = Wallpaper::listWallpaperInfoForMimetype(mimetype); wallpaperList = Wallpaper::listWallpaperInfoForMimetype(mimetype);
} }
}
if (!appletList.isEmpty() || !wallpaperList.isEmpty()) { if (!appletList.isEmpty() || !wallpaperList.isEmpty()) {
choices->clear(); choices->clear();