Branch: master

382b6ce7 2014-10-11 17:19:22 Timothy Pearson 
Fix ServiceTypes, ExcludeServiceTypes, and DocPath desktop file entries to match XDG specifications
M atlantikdesigner/atlantikdesigner.desktop
M kaddressbook-plugins/xxports/gmx/gmx_xxport.desktop
M kaddressbook-plugins/xxports/kworldclock/geo_xxport.desktop
M kate/cppsymbolviewer/katecppsymbolviewer.desktop
M kate/filelistloader/katefll.desktop
M kate/filelistloader/katefll_initplugin.desktop
M kate/filelistloader/katefll_plugin.desktop
M kate/filetemplates/plugin/katefiletemplates.desktop
M kate/helloworld/katehelloworld.desktop
M kate/htmltools/katehtmltools.desktop
M kate/insertcommand/kateinsertcommand.desktop
M kate/kate-plugins.desktop
M kate/katesort/katesort.desktop
M kate/kjswrapper/samples/katekjsconsolewindow.desktop
M kate/kjswrapper/samples/katekjsselect.desktop
M kate/kjswrapper/samples/katekjstest1.desktop
M kate/kpybrowser/katepybrowse.desktop
M kate/make/katemake.desktop
M kate/modeline/katemodeline.desktop
M kate/openheader/kateopenheader.desktop
M kate/snippets/katesnippets.desktop
M kate/tabbarextension/katetabbarextension.desktop
M kate/textfilter/katetextfilter.desktop
M kate/xmlcheck/katexmlcheck.desktop
M kate/xmltools/katexmltools.desktop
M kicker-applets/kolourpicker/kolourpicker.desktop
M kicker-applets/ktimemon/ktimemon.desktop
M konq-plugins/akregator/akregator_konqplugin.desktop
M konq-plugins/arkplugin/ark_plugin.desktop
M konq-plugins/arkplugin/arkplugin.desktop
M konq-plugins/babelfish/plugin_babelfish.desktop
M konq-plugins/crashes/crashesplugin.desktop
M konq-plugins/dirfilter/dirfilter_plugin.desktop
M konq-plugins/dirfilter/dirfilterplugin.desktop
M konq-plugins/domtreeviewer/plugin_domtreeviewer.desktop
M konq-plugins/fsview/fsview.desktop
M konq-plugins/fsview/fsview_part.desktop
M konq-plugins/imagerotation/imageconverter.desktop
M konq-plugins/imagerotation/jpegorient.desktop
M konq-plugins/kimgalleryplugin/kimgalleryplugin.desktop
M konq-plugins/kuick/kcmkuick/kcmkuick.desktop
M konq-plugins/kuick/kuick_plugin.desktop
M konq-plugins/kuick/kuickplugin.desktop
M konq-plugins/mediarealfolder/media_realfolder.desktop
M konq-plugins/minitools/minitoolsplugin.desktop
M konq-plugins/rsync/rsync_plugin.desktop
M konq-plugins/rsync/rsyncplugin.desktop
M konq-plugins/sidebar/mediaplayer/mediaplayerplugin.desktop
M konq-plugins/sidebar/metabar/src/serviceloader.cpp
M konq-plugins/tdehtmlsettingsplugin/tdehtmlsettingsplugin.desktop
M konq-plugins/uachanger/uachangerplugin.desktop
M konq-plugins/validators/plugin_validators.desktop
M konq-plugins/webarchiver/plugin_webarchiver.desktop
M konq-plugins/webarchiver/webarchivethumbnail.desktop
M ksig/ksig.desktop
M renamedlgplugins/audio/renaudiodlg.desktop
M renamedlgplugins/images/renimagedlg.desktop
M tdefile-plugins/cert/tdefile_cert.desktop
M tdefile-plugins/desktop/tdefile_desktop.cpp
M tdefile-plugins/desktop/tdefile_desktop.desktop
M tdefile-plugins/folder/tdefile_folder.desktop
M tdefile-plugins/html/tdefile_html.desktop
M tdefile-plugins/lnk/tdefile_lnk.desktop
M tdefile-plugins/mhtml/tdefile_mhtml.desktop
M tdefile-plugins/txt/tdefile_txt.desktop
M tutorials/docprimer.desktop
M tutorials/markup.desktop
M tutorials/styleguide.desktop
 
diff --git a/atlantikdesigner/atlantikdesigner.desktop b/atlantikdesigner/atlantikdesigner.desktop
index ad110e2..7596c04 100644
--- a/atlantikdesigner/atlantikdesigner.desktop
+++ b/atlantikdesigner/atlantikdesigner.desktop
@@ -168,4 +168,4 @@
 GenericName[vi]=B��� thi���t k��� b���ng ki���u Monopoly��
 GenericName[zh_CN]=������ Monopoly(R) ������������������
 GenericName[zh_TW]=������ Monopoly�� ���������������
-DocPath=atlantikdesigner/index.html
+X-DocPath=atlantikdesigner/index.html
diff --git a/kaddressbook-plugins/xxports/gmx/gmx_xxport.desktop b/kaddressbook-plugins/xxports/gmx/gmx_xxport.desktop
index 10db1d4..1d16dfc 100644
--- a/kaddressbook-plugins/xxports/gmx/gmx_xxport.desktop
+++ b/kaddressbook-plugins/xxports/gmx/gmx_xxport.desktop
@@ -104,6 +104,6 @@
 Comment[zh_CN]=��� GMX ������������������������������������������
 Comment[zh_TW]=������/������ GMX ������������������������������
 Type=Service
-ServiceTypes=KAddressBook/XXPort
+X-TDE-ServiceTypes=KAddressBook/XXPort
 X-TDE-KAddressBook-XXPortPluginVersion=1
 
diff --git a/kaddressbook-plugins/xxports/kworldclock/geo_xxport.desktop b/kaddressbook-plugins/xxports/kworldclock/geo_xxport.desktop
index d1652fc..c4d215d 100644
--- a/kaddressbook-plugins/xxports/kworldclock/geo_xxport.desktop
+++ b/kaddressbook-plugins/xxports/kworldclock/geo_xxport.desktop
@@ -107,6 +107,6 @@
 Comment[zh_CN]=������������������������������������ KWorldClock ������������������
 Comment[zh_TW]=������ GEO ������������������ KWorldClock ������
 Type=Service
-ServiceTypes=KAddressBook/XXPort
+X-TDE-ServiceTypes=KAddressBook/XXPort
 X-TDE-KAddressBook-XXPortPluginVersion=1
 
diff --git a/kate/cppsymbolviewer/katecppsymbolviewer.desktop b/kate/cppsymbolviewer/katecppsymbolviewer.desktop
index 937285e..2c2d885 100644
--- a/kate/cppsymbolviewer/katecppsymbolviewer.desktop
+++ b/kate/cppsymbolviewer/katecppsymbolviewer.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Service
-ServiceTypes=Kate/Plugin
+X-TDE-ServiceTypes=Kate/Plugin
 X-TDE-Library=katecppsymbolviewerplugin
 X-Kate-Version=2.5
 Name=Kate C/C++ Symbol Viewer
diff --git a/kate/filelistloader/katefll.desktop b/kate/filelistloader/katefll.desktop
index 0a5e58b..5987a50 100644
--- a/kate/filelistloader/katefll.desktop
+++ b/kate/filelistloader/katefll.desktop
@@ -77,7 +77,7 @@
 NoDisplay=true
 Icon=kate
 Path=
-DocPath=kate/index.html
+X-DocPath=kate/index.html
 Type=Application
 Terminal=false
 X-DCOP-ServiceType=Multi
diff --git a/kate/filelistloader/katefll_initplugin.desktop b/kate/filelistloader/katefll_initplugin.desktop
index bca8f14..4011499 100644
--- a/kate/filelistloader/katefll_initplugin.desktop
+++ b/kate/filelistloader/katefll_initplugin.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Service
-ServiceTypes=Kate/InitPlugin
+X-TDE-ServiceTypes=Kate/InitPlugin
 X-TDE-Library=katefll_initplugin
 X-Kate-Version=2.5
 Name=Kate FLL Init Plugin
diff --git a/kate/filelistloader/katefll_plugin.desktop b/kate/filelistloader/katefll_plugin.desktop
index c25c5ca..7b2a419 100644
--- a/kate/filelistloader/katefll_plugin.desktop
+++ b/kate/filelistloader/katefll_plugin.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Service
-ServiceTypes=Kate/Plugin
+X-TDE-ServiceTypes=Kate/Plugin
 X-TDE-Library=katefll_plugin
 X-Kate-Version=2.5
 Name=Kate File List Loader
diff --git a/kate/filetemplates/plugin/katefiletemplates.desktop b/kate/filetemplates/plugin/katefiletemplates.desktop
index 3d5ca65..65d56f8 100644
--- a/kate/filetemplates/plugin/katefiletemplates.desktop
+++ b/kate/filetemplates/plugin/katefiletemplates.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Service
-ServiceTypes=Kate/Plugin
+X-TDE-ServiceTypes=Kate/Plugin
 X-Kate-Version=2.5
 X-TDE-Library=katefiletemplates
 Name=Kate File Templates
diff --git a/kate/helloworld/katehelloworld.desktop b/kate/helloworld/katehelloworld.desktop
index 6932e8d..2aada7c 100644
--- a/kate/helloworld/katehelloworld.desktop
+++ b/kate/helloworld/katehelloworld.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Service
-ServiceTypes=Kate/Plugin
+X-TDE-ServiceTypes=Kate/Plugin
 X-TDE-Library=katehelloworldplugin
 X-Kate-Version=2.5
 Name=My First Kate Plugin
diff --git a/kate/htmltools/katehtmltools.desktop b/kate/htmltools/katehtmltools.desktop
index 6754c3f..6f361a6 100644
--- a/kate/htmltools/katehtmltools.desktop
+++ b/kate/htmltools/katehtmltools.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Service
-ServiceTypes=Kate/Plugin
+X-TDE-ServiceTypes=Kate/Plugin
 X-TDE-Library=katehtmltoolsplugin
 X-Kate-Version=2.5
 Name=Kate HTML Tools
diff --git a/kate/insertcommand/kateinsertcommand.desktop b/kate/insertcommand/kateinsertcommand.desktop
index 606f21c..b762662 100644
--- a/kate/insertcommand/kateinsertcommand.desktop
+++ b/kate/insertcommand/kateinsertcommand.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Service
-ServiceTypes=Kate/Plugin
+X-TDE-ServiceTypes=Kate/Plugin
 X-TDE-Library=kateinsertcommandplugin
 X-Kate-Version=2.5
 Name=Kate InsertCommand
diff --git a/kate/kate-plugins.desktop b/kate/kate-plugins.desktop
index c35d9a5..67d8767 100644
--- a/kate/kate-plugins.desktop
+++ b/kate/kate-plugins.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Icon=kate
-DocPath=kate-plugins/index.html
+X-DocPath=kate-plugins/index.html
 Categories=Qt;TDE;TextEditor;
 NoDisplay=true
 Name=Kate Plugins
diff --git a/kate/katesort/katesort.desktop b/kate/katesort/katesort.desktop
index 30aa04f..7bc098e 100644
--- a/kate/katesort/katesort.desktop
+++ b/kate/katesort/katesort.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Service
-ServiceTypes=Kate/Plugin
+X-TDE-ServiceTypes=Kate/Plugin
 X-TDE-Library=katesortplugin
 X-Kate-Version=2.5
 Name=Kate Sort
diff --git a/kate/kjswrapper/samples/katekjsconsolewindow.desktop b/kate/kjswrapper/samples/katekjsconsolewindow.desktop
index 7412384..a98a637 100644
--- a/kate/kjswrapper/samples/katekjsconsolewindow.desktop
+++ b/kate/kjswrapper/samples/katekjsconsolewindow.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Service
-ServiceTypes=Kate/Plugin
+X-TDE-ServiceTypes=Kate/Plugin
 X-TDE-Library=katekjswrapperplugin
 X-Kate-Version=2.2
 X-Kate-PluginName=katekjsconsolewindow
diff --git a/kate/kjswrapper/samples/katekjsselect.desktop b/kate/kjswrapper/samples/katekjsselect.desktop
index ce5472a..38b9701 100644
--- a/kate/kjswrapper/samples/katekjsselect.desktop
+++ b/kate/kjswrapper/samples/katekjsselect.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Service
-ServiceTypes=Kate/Plugin
+X-TDE-ServiceTypes=Kate/Plugin
 X-TDE-Library=katekjswrapperplugin
 X-Kate-Version=2.2
 X-Kate-PluginName=katekjsselect
diff --git a/kate/kjswrapper/samples/katekjstest1.desktop b/kate/kjswrapper/samples/katekjstest1.desktop
index 95fbeaf..6ce1fc0 100644
--- a/kate/kjswrapper/samples/katekjstest1.desktop
+++ b/kate/kjswrapper/samples/katekjstest1.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Service
-ServiceTypes=Kate/Plugin
+X-TDE-ServiceTypes=Kate/Plugin
 X-TDE-Library=katekjswrapperplugin
 X-Kate-Version=2.2
 X-Kate-PluginName=katekjstest1
diff --git a/kate/kpybrowser/katepybrowse.desktop b/kate/kpybrowser/katepybrowse.desktop
index bd18aa2..bdfba0d 100644
--- a/kate/kpybrowser/katepybrowse.desktop
+++ b/kate/kpybrowser/katepybrowse.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Service
-ServiceTypes=Kate/Plugin
+X-TDE-ServiceTypes=Kate/Plugin
 X-TDE-Library=katepybrowseplugin
 X-Kate-Version=2.5
 Name=Kate Python Browser Plugin
diff --git a/kate/make/katemake.desktop b/kate/make/katemake.desktop
index a85840d..1ba4c52 100644
--- a/kate/make/katemake.desktop
+++ b/kate/make/katemake.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Service
-ServiceTypes=Kate/Plugin
+X-TDE-ServiceTypes=Kate/Plugin
 X-TDE-Library=katemakeplugin
 X-Kate-Version=2.5
 Name=Kate Make Plugin
diff --git a/kate/modeline/katemodeline.desktop b/kate/modeline/katemodeline.desktop
index d69b29f..2e91a81 100644
--- a/kate/modeline/katemodeline.desktop
+++ b/kate/modeline/katemodeline.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Service
-ServiceTypes=Kate/Plugin
+X-TDE-ServiceTypes=Kate/Plugin
 X-TDE-Library=katemodelineplugin
 X-Kate-Version=2.5
 Name=Kate Modeline Plugin
diff --git a/kate/openheader/kateopenheader.desktop b/kate/openheader/kateopenheader.desktop
index 9fee65a..9d1f439 100644
--- a/kate/openheader/kateopenheader.desktop
+++ b/kate/openheader/kateopenheader.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Service
-ServiceTypes=Kate/Plugin
+X-TDE-ServiceTypes=Kate/Plugin
 X-TDE-Library=kateopenheaderplugin
 X-Kate-Version=2.5
 Name=Kate OpenHeader
diff --git a/kate/snippets/katesnippets.desktop b/kate/snippets/katesnippets.desktop
index 6fa1607..8da62f1 100644
--- a/kate/snippets/katesnippets.desktop
+++ b/kate/snippets/katesnippets.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Service
-ServiceTypes=Kate/Plugin
+X-TDE-ServiceTypes=Kate/Plugin
 X-TDE-Library=katesnippetsplugin
 X-Kate-Version=2.5
 ** Diff limit reached (max: 250 lines) **