Branch: master

23d9b926 2014-10-11 17:19:19 Timothy Pearson
Fix ServiceTypes, ExcludeServiceTypes, and DocPath desktop file entries to match XDG specifications
M apps/ktorrent/ktorrent.desktop
M plugins/infowidget/ktinfowidgetplugin.desktop
M plugins/ipfilter/ktipfilterplugin.desktop
M plugins/logviewer/ktlogviewerplugin.desktop
M plugins/partfileimport/ktpartfileimportplugin.desktop
M plugins/rssfeed/ktrssfeedplugin.desktop
M plugins/scanfolder/ktscanfolderplugin.desktop
M plugins/scheduler/ktschedulerplugin.desktop
M plugins/search/ktsearchplugin.desktop
M plugins/stats/ktstatsplugin.desktop
M plugins/upnp/ktupnpplugin.desktop
M plugins/webinterface/ktwebinterfaceplugin.desktop
M plugins/zeroconf/ktzeroconfplugin.desktop
diff --git a/apps/ktorrent/ktorrent.desktop b/apps/ktorrent/ktorrent.desktop
index a5ae848..10261af 100644
--- a/apps/ktorrent/ktorrent.desktop
+++ b/apps/ktorrent/ktorrent.desktop
@@ -42,7 +42,7 @@
 Exec=ktorrent %i %m -caption "%c" %u
 Icon=ktorrent
 Type=Application
-DocPath=ktorrent/index.html
+X-DocPath=ktorrent/index.html
 MimeType=application/x-bittorrent;application/x-torrent;
 X-DCOP-ServiceType=Unique
 Comment=A BitTorrent program for TDE
diff --git a/plugins/infowidget/ktinfowidgetplugin.desktop b/plugins/infowidget/ktinfowidgetplugin.desktop
index 5889655..8ea5368 100644
--- a/plugins/infowidget/ktinfowidgetplugin.desktop
+++ b/plugins/infowidget/ktinfowidgetplugin.desktop
@@ -24,6 +24,6 @@
 Name[xx]=xxSearchPluginxx
 Name[zh_CN]=������������
 Name[zh_TW]=������������������
-ServiceTypes=KTorrent/Plugin
+X-TDE-ServiceTypes=KTorrent/Plugin
 Type=Service
 X-TDE-Library=ktinfowidgetplugin
diff --git a/plugins/ipfilter/ktipfilterplugin.desktop b/plugins/ipfilter/ktipfilterplugin.desktop
index c92041b..4435c28 100644
--- a/plugins/ipfilter/ktipfilterplugin.desktop
+++ b/plugins/ipfilter/ktipfilterplugin.desktop
@@ -51,6 +51,6 @@
 Comment[xx]=xxIP filter plugin for KTorrentxx
 Comment[zh_CN]=KTorrent ��� IP ���������������
 Comment[zh_TW]=KTorrent IP ���������������������
-ServiceTypes=KTorrent/Plugin
+X-TDE-ServiceTypes=KTorrent/Plugin
 Type=Service
 X-TDE-Library=ktipfilterplugin
diff --git a/plugins/logviewer/ktlogviewerplugin.desktop b/plugins/logviewer/ktlogviewerplugin.desktop
index 7d20756..4d7c9ad 100644
--- a/plugins/logviewer/ktlogviewerplugin.desktop
+++ b/plugins/logviewer/ktlogviewerplugin.desktop
@@ -21,6 +21,6 @@
 Name[xx]=xxLogViewerPluginxx
 Name[zh_CN]=���������������������
 Name[zh_TW]=���������������������������
-ServiceTypes=KTorrent/Plugin
+X-TDE-ServiceTypes=KTorrent/Plugin
 Type=Service
 X-TDE-Library=ktlogviewerplugin
diff --git a/plugins/partfileimport/ktpartfileimportplugin.desktop b/plugins/partfileimport/ktpartfileimportplugin.desktop
index 8fc7fab..e84cbaf 100644
--- a/plugins/partfileimport/ktpartfileimportplugin.desktop
+++ b/plugins/partfileimport/ktpartfileimportplugin.desktop
@@ -20,6 +20,6 @@
 Name[xx]=xxPartialFileImportPluginxx
 Name[zh_CN]=������������������������
 Name[zh_TW]=PartialFileImport������������
-ServiceTypes=KTorrent/Plugin
+X-TDE-ServiceTypes=KTorrent/Plugin
 Type=Service
 X-TDE-Library=ktpartfileimportplugin
diff --git a/plugins/rssfeed/ktrssfeedplugin.desktop b/plugins/rssfeed/ktrssfeedplugin.desktop
index b76bda1..99f6fb3 100644
--- a/plugins/rssfeed/ktrssfeedplugin.desktop
+++ b/plugins/rssfeed/ktrssfeedplugin.desktop
@@ -17,6 +17,6 @@
 Name[uk]=������������ ���������� RSS
 Name[xx]=xxRssFeedPluginxx
 Name[zh_CN]=RSS ������������
-ServiceTypes=KTorrent/Plugin
+X-TDE-ServiceTypes=KTorrent/Plugin
 Type=Service
 X-TDE-Library=ktrssfeedplugin
diff --git a/plugins/scanfolder/ktscanfolderplugin.desktop b/plugins/scanfolder/ktscanfolderplugin.desktop
index af2afeb..53c7a6c 100644
--- a/plugins/scanfolder/ktscanfolderplugin.desktop
+++ b/plugins/scanfolder/ktscanfolderplugin.desktop
@@ -21,6 +21,6 @@
 Name[xx]=xxScanFolderPluginxx
 Name[zh_CN]=���������������������
 Name[zh_TW]=���������������������������
-ServiceTypes=KTorrent/Plugin
+X-TDE-ServiceTypes=KTorrent/Plugin
 Type=Service
 X-TDE-Library=ktscanfolderplugin
diff --git a/plugins/scheduler/ktschedulerplugin.desktop b/plugins/scheduler/ktschedulerplugin.desktop
index 32cbf1b..ea35426 100644
--- a/plugins/scheduler/ktschedulerplugin.desktop
+++ b/plugins/scheduler/ktschedulerplugin.desktop
@@ -21,6 +21,6 @@
 Name[xx]=xxSchedulerPluginxx
 Name[zh_CN]=���������������������
 Name[zh_TW]=���������������������
-ServiceTypes=KTorrent/Plugin
+X-TDE-ServiceTypes=KTorrent/Plugin
 Type=Service
 X-TDE-Library=ktschedulerplugin
diff --git a/plugins/search/ktsearchplugin.desktop b/plugins/search/ktsearchplugin.desktop
index 9be9e88..9feabe0 100644
--- a/plugins/search/ktsearchplugin.desktop
+++ b/plugins/search/ktsearchplugin.desktop
@@ -55,6 +55,6 @@
 Comment[xx]=xxSearch plugin for KTorrentxx
 Comment[zh_CN]=KTorrent ���������������
 Comment[zh_TW]=KTorrent ������������������
-ServiceTypes=KTorrent/Plugin
+X-TDE-ServiceTypes=KTorrent/Plugin
 Type=Service
 X-TDE-Library=ktsearchplugin
diff --git a/plugins/stats/ktstatsplugin.desktop b/plugins/stats/ktstatsplugin.desktop
index 0ac05aa..21a2901 100644
--- a/plugins/stats/ktstatsplugin.desktop
+++ b/plugins/stats/ktstatsplugin.desktop
@@ -20,5 +20,5 @@
 Name[zh_CN]=������������
 Comment=
 Comment[xx]=xxxx
-ServiceTypes=KTorrent/Plugin
+X-TDE-ServiceTypes=KTorrent/Plugin
 X-TDE-Library=ktstatsplugin
diff --git a/plugins/upnp/ktupnpplugin.desktop b/plugins/upnp/ktupnpplugin.desktop
index 0347fef..ea17434 100644
--- a/plugins/upnp/ktupnpplugin.desktop
+++ b/plugins/upnp/ktupnpplugin.desktop
@@ -21,6 +21,6 @@
 Name[xx]=xxUPnPPluginxx
 Name[zh_CN]=UPnP ������
 Name[zh_TW]=UPnP������������
-ServiceTypes=KTorrent/Plugin
+X-TDE-ServiceTypes=KTorrent/Plugin
 Type=Service
 X-TDE-Library=ktupnpplugin
diff --git a/plugins/webinterface/ktwebinterfaceplugin.desktop b/plugins/webinterface/ktwebinterfaceplugin.desktop
index edc030d..aa2dfa5 100644
--- a/plugins/webinterface/ktwebinterfaceplugin.desktop
+++ b/plugins/webinterface/ktwebinterfaceplugin.desktop
@@ -17,6 +17,6 @@
 Name[uk]=������-������������������
 Name[xx]=xxWebInterfacexx
 Name[zh_CN]=Web ������
-ServiceTypes=KTorrent/Plugin
+X-TDE-ServiceTypes=KTorrent/Plugin
 Type=Service
 X-TDE-Library=ktwebinterfaceplugin
diff --git a/plugins/zeroconf/ktzeroconfplugin.desktop b/plugins/zeroconf/ktzeroconfplugin.desktop
index 5211752..2cabcc7 100644
--- a/plugins/zeroconf/ktzeroconfplugin.desktop
+++ b/plugins/zeroconf/ktzeroconfplugin.desktop
@@ -17,6 +17,6 @@
 Name[uk]=������������ ZeroConf
 Name[xx]=xxZeroConfPluginxx
 Name[zh_CN]=ZeroConf ������
-ServiceTypes=KTorrent/Plugin
+X-TDE-ServiceTypes=KTorrent/Plugin
 Type=Service
 X-TDE-Library=ktzeroconfplugin