49 lines
2.3 KiB
Diff
49 lines
2.3 KiB
Diff
|
From 7804efbf05a08d0170c24f4d6f14b661fcfb9d9e Mon Sep 17 00:00:00 2001
|
||
|
|
Message-Id: <7804efbf05a08d0170c24f4d6f14b661fcfb9d9e.1313971467.git.kevin.kofler@chello.at>
|
||
|
|
From: Kevin Kofler <kevin.kofler@chello.at>
|
||
|
|
Date: Mon, 22 Aug 2011 01:53:57 +0200
|
||
|
|
Subject: [PATCH] Bugfix: Plasma::PackageMetadata::read: Match the behavior of
|
||
|
|
KService.
|
||
|
|
|
||
|
|
---
|
||
|
|
plasma/packagemetadata.cpp | 23 +++++++++++++++++++++--
|
||
|
|
1 files changed, 21 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/plasma/packagemetadata.cpp b/plasma/packagemetadata.cpp
|
||
|
|
index 59163b2..e6b47b6 100644
|
||
|
|
--- a/plasma/packagemetadata.cpp
|
||
|
|
+++ b/plasma/packagemetadata.cpp
|
||
|
|
@@ -120,8 +120,27 @@ void PackageMetadata::read(const QString &filename)
|
||
|
|
d->name = config.readEntry("Name", d->name);
|
||
|
|
d->icon = config.readEntry("Icon", d->icon);
|
||
|
|
d->description = config.readEntry("Comment", d->description);
|
||
|
|
- d->keywords = config.readEntry("Keywords", d->keywords);
|
||
|
|
- d->serviceType = config.readEntry("X-KDE-ServiceTypes", d->serviceType);
|
||
|
|
+ bool hasKeywords = config.hasKey("Keywords");
|
||
|
|
+ bool hasXKdeKeywords = config.hasKey("X-KDE-Keywords");
|
||
|
|
+ if (hasKeywords && hasXKdeKeywords) {
|
||
|
|
+ d->keywords = config.readEntry("Keywords", d->keywords);
|
||
|
|
+ d->keywords.append(config.readEntry("X-KDE-Keywords", d->keywords));
|
||
|
|
+ } else if (hasKeywords) {
|
||
|
|
+ d->keywords = config.readEntry("Keywords", d->keywords);
|
||
|
|
+ } else if (hasXKdeKeywords) {
|
||
|
|
+ d->keywords = config.readEntry("X-KDE-Keywords", d->keywords);
|
||
|
|
+ }
|
||
|
|
+ bool hasServiceTypes = config.hasKey("ServiceTypes");
|
||
|
|
+ bool hasXKdeServiceTypes = config.hasKey("X-KDE-ServiceTypes");
|
||
|
|
+ if (hasServiceTypes && hasXKdeServiceTypes) {
|
||
|
|
+ d->serviceType = config.readEntry("ServiceTypes", d->serviceType);
|
||
|
|
+ d->serviceType.append(',');
|
||
|
|
+ d->serviceType.append(config.readEntry("X-KDE-ServiceTypes", d->serviceType));
|
||
|
|
+ } else if (hasServiceTypes) {
|
||
|
|
+ d->serviceType = config.readEntry("ServiceTypes", d->serviceType);
|
||
|
|
+ } else if (hasXKdeServiceTypes) {
|
||
|
|
+ d->serviceType = config.readEntry("X-KDE-ServiceTypes", d->serviceType);
|
||
|
|
+ }
|
||
|
|
d->pluginName = config.readEntry("X-KDE-PluginInfo-Name", d->pluginName);
|
||
|
|
d->author = config.readEntry("X-KDE-PluginInfo-Author", d->author);
|
||
|
|
d->email = config.readEntry("X-KDE-PluginInfo-Email", d->email);
|
||
|
|
--
|
||
|
|
1.7.4.4
|
||
|
|
|