From 36f80355f597cc268ed6120b8c6a785a719d6d25 Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Mon, 22 Aug 2011 02:47:24 +0200 Subject: [PATCH] Also delete the duplicate entries in PackageMetadata::write. --- ...ckageMetadata-read-Match-the-behavio.patch | 23 ++++++++++++++----- 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/0004-Bugfix-Plasma-PackageMetadata-read-Match-the-behavio.patch b/0004-Bugfix-Plasma-PackageMetadata-read-Match-the-behavio.patch index 22ef6c9..1154d55 100644 --- a/0004-Bugfix-Plasma-PackageMetadata-read-Match-the-behavio.patch +++ b/0004-Bugfix-Plasma-PackageMetadata-read-Match-the-behavio.patch @@ -1,19 +1,30 @@ -From 7804efbf05a08d0170c24f4d6f14b661fcfb9d9e Mon Sep 17 00:00:00 2001 -Message-Id: <7804efbf05a08d0170c24f4d6f14b661fcfb9d9e.1313971467.git.kevin.kofler@chello.at> +From abaa32625edfd814320028200831cfedd4a4f9df Mon Sep 17 00:00:00 2001 +Message-Id: From: Kevin Kofler Date: Mon, 22 Aug 2011 01:53:57 +0200 Subject: [PATCH] Bugfix: Plasma::PackageMetadata::read: Match the behavior of KService. +Also delete the duplicate entries in PackageMetadata::write. --- - plasma/packagemetadata.cpp | 23 +++++++++++++++++++++-- - 1 files changed, 21 insertions(+), 2 deletions(-) + plasma/packagemetadata.cpp | 25 +++++++++++++++++++++++-- + 1 files changed, 23 insertions(+), 2 deletions(-) diff --git a/plasma/packagemetadata.cpp b/plasma/packagemetadata.cpp -index 59163b2..e6b47b6 100644 +index 59163b2..c9ff446 100644 --- a/plasma/packagemetadata.cpp +++ b/plasma/packagemetadata.cpp -@@ -120,8 +120,27 @@ void PackageMetadata::read(const QString &filename) +@@ -94,7 +94,9 @@ void PackageMetadata::write(const QString &filename) const + config.writeEntry("Icon", d->icon); + config.writeEntry("Comment", d->description); + config.writeEntry("Keywords", d->keywords); ++ config.deleteEntry("X-KDE-Keywords"); + config.writeEntry("X-KDE-ServiceTypes", d->serviceType); ++ config.deleteEntry("ServiceTypes"); + config.writeEntry("X-KDE-PluginInfo-Name", d->pluginName); + config.writeEntry("X-KDE-PluginInfo-Author", d->author); + config.writeEntry("X-KDE-PluginInfo-Email", d->email); +@@ -120,8 +122,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);