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

List:       kde-commits
Subject:    branches/KDE/4.4/kdelibs/plasma
From:       Aaron J. Seigo <aseigo () kde ! org>
Date:       2010-05-04 3:27:42
Message-ID: 20100504032742.8400FAC8AB () svn ! kde ! org
[Download RAW message or body]

SVN commit 1122506 by aseigo:

backport r1122503


 M  +7 -2      applet.cpp  


--- branches/KDE/4.4/kdelibs/plasma/applet.cpp #1122505: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('/');
         }


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