From 1cbd77747859c4c4042add892338877ffae9a44b Mon Sep 17 00:00:00 2001
From: "Aaron J. Seigo" <aseigo@kde.org>
Date: Wed, 26 Jan 2011 20:09:18 +0000
Subject: [PATCH] if the current wallpaper plugin supports the mimetype being
 dropped, offer that; otherwise look for something new

svn path=/trunk/KDE/kdelibs/; revision=1217339
---
 containment.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

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