Sophie

Sophie

distrib > Mandriva > 2010.2 > i586 > media > main-release-src > by-pkgid > 40d468e76b836c0cc4926ec517031ce5 > files > 16

kdelibs4-4.4.3-16mdv2010.1.src.rpm

Index: kdelibs/plasma/applet.cpp
===================================================================
--- kdelibs/plasma/applet.cpp	(révision 1122505)
+++ kdelibs/plasma/applet.cpp	(révision 1122506)
@@ -2585,8 +2585,13 @@
         // find where the Package is
         QString path = packagePath;
         if (path.isEmpty()) {
-            path = KStandardDirs::locate("data", "plasma/plasmoids/" + appletDescription.pluginName() + "/metadata.desktop");
-            path.replace(QString("/metadata.desktop"),QString("/"));
+            QString subPath = q->packageStructure()->defaultPackageRoot() + '/' + appletDescription.pluginName() + '/';
+            path = KStandardDirs::locate("data", subPath + "metadata.desktop");
+            if (path.isEmpty()) {
+                path = KStandardDirs::locate("data", subPath);
+            } else {
+                path.remove(QString("metadata.desktop"));
+            }
         } else if (!path.endsWith('/')) {
             path.append('/');
         }