[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdelibs/plasma
From:       Aaron J. Seigo <aseigo () kde ! org>
Date:       2011-01-26 20:09:19
Message-ID: 20110126200919.0F181AC8BB () svn ! kde ! org
[Download RAW message or body]

SVN commit 1217339 by aseigo:

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


 M  +5 -0      containment.cpp  


--- trunk/KDE/kdelibs/plasma/containment.cpp #1217338:1217339
@@ -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,8 +1524,12 @@
         appletList << Applet::listAppletInfoForMimetype(mimetype);
         KPluginInfo::List wallpaperList;
         if (q->drawWallpaper()) {
+            if (wallpaper && wallpaper->supportsMimetype(mimetype)) {
+                wallpaperList << wallpaper->d->wallpaperDescription;
+            } else {
             wallpaperList = Wallpaper::listWallpaperInfoForMimetype(mimetype);
         }
+        }
 
         if (!appletList.isEmpty() || !wallpaperList.isEmpty()) {
             choices->clear();


[prev in list] [next in list] [prev in thread] [next in thread]