From 9ea9f63a7ebfbca038f2d87420e66c0853db20c7 Mon Sep 17 00:00:00 2001 From: Jonathan Riddell Date: Mon, 29 Mar 2010 13:55:07 +0000 Subject: [PATCH] Check for actual metadata file, else it will try to load the plasmoid from ~/.kde if only the directory exists even though the plasmoid might be in /usr BUG:231761 "Python plasmoids can no longer run from system directory" svn path=/trunk/KDE/kdelibs/; revision=1108640 --- applet.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/applet.cpp b/applet.cpp index 91443725e..bbd028498 100644 --- a/applet.cpp +++ b/applet.cpp @@ -2583,7 +2583,8 @@ void AppletPrivate::init(const QString &packagePath) // find where the Package is QString path = packagePath; if (path.isEmpty()) { - path = KStandardDirs::locate("data", "plasma/plasmoids/" + appletDescription.pluginName() + '/'); + path = KStandardDirs::locate("data", "plasma/plasmoids/" + appletDescription.pluginName() + "/metadata.desktop"); + path.replace(QString("/metadata.desktop"),QString("/")); } else if (!path.endsWith('/')) { path.append('/'); }