From 28a014d6fefea160334048c0da9ea31f807f3693 Mon Sep 17 00:00:00 2001
From: "Aaron J. Seigo" <aseigo@kde.org>
Date: Mon, 8 Sep 2008 16:55:05 +0000
Subject: [PATCH] use the standard KPluginInfo stuff for this

svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=858758
---
 dataengine.cpp                         | 2 +-
 dataenginemanager.cpp                  | 7 +++++--
 servicetypes/plasma-dataengine.desktop | 3 ---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dataengine.cpp b/dataengine.cpp
index e543ec821..8abf77d4e 100644
--- a/dataengine.cpp
+++ b/dataengine.cpp
@@ -428,7 +428,7 @@ DataEnginePrivate::DataEnginePrivate(DataEngine* e, KService::Ptr service)
         return;
     }
 
-    engineName = service->property("X-Plasma-EngineName").toString();
+    engineName = service->name();
     if (engineName.isEmpty()) {
         engineName = i18n("Unnamed");
     }
diff --git a/dataenginemanager.cpp b/dataenginemanager.cpp
index 1908b1400..fbbfe8c6d 100644
--- a/dataenginemanager.cpp
+++ b/dataenginemanager.cpp
@@ -118,7 +118,7 @@ Plasma::DataEngine* DataEngineManager::loadEngine(const QString& name)
     }
 
     // load the engine, add it to the engines
-    QString constraint = QString("[X-Plasma-EngineName] == '%1'").arg(name);
+    QString constraint = QString("[X-KDE-PluginInfo-Name] == '%1'").arg(name);
     KService::List offers = KServiceTypeTrader::self()->query("Plasma/DataEngine",
                                                               constraint);
     QString error;
@@ -170,7 +170,10 @@ QStringList DataEngineManager::listAllEngines()
     QStringList engines;
     KService::List offers = KServiceTypeTrader::self()->query("Plasma/DataEngine");
     foreach (const KService::Ptr &service, offers) {
-        engines.append(service->property("X-Plasma-EngineName").toString());
+        QString name = service->property("X-KDE-PluginInfo-Name").toString();
+        if (!name.isEmpty()) {
+            engines.append(name);
+        }
     }
 
     return engines;
diff --git a/servicetypes/plasma-dataengine.desktop b/servicetypes/plasma-dataengine.desktop
index 86149cbf6..e6c6fa380 100644
--- a/servicetypes/plasma-dataengine.desktop
+++ b/servicetypes/plasma-dataengine.desktop
@@ -60,6 +60,3 @@ Comment[x-test]=xxPlasma Data Enginexx
 Comment[zh_CN]=Plasma 数据引擎
 Comment[zh_TW]=Plasma 資料引擎
 
-[PropertyDef::X-Plasma-EngineName]
-Type=QString
-