Branch: master

d46b1b9c 2014-10-11 17:19:23 Timothy Pearson 
Fix ServiceTypes, ExcludeServiceTypes, and DocPath desktop file entries to match XDG specifications
M arts/kde/mcop-dcop/kmcop.desktop
M arts/knotify/knotify.desktop
M interfaces/tdescript/sample/shellscript.desktop
M kate/data/katepart.desktop
M kate/plugins/autobookmarker/tdetexteditor_autobookmarker.desktop
M kate/plugins/insertfile/tdetexteditor_insertfile.desktop
M kate/plugins/isearch/tdetexteditor_isearch.desktop
M kate/plugins/kdatatool/tdetexteditor_kdatatool.desktop
M kate/plugins/wordcompletion/tdetexteditor_docwordcompletion.desktop
M kded/test/test.desktop
M networkstatus/networkstatus.desktop
M tdeabc/plugins/dir/dir.desktop
M tdeabc/plugins/evolution/evolution.desktop
M tdeabc/plugins/file/file.desktop
M tdeabc/plugins/ldaptdeio/ldaptdeio.desktop
M tdeabc/plugins/net/net.desktop
M tdeabc/tdeabc_manager.desktop
M tdecert/tdecertpart.desktop
M tdefile-plugins/elf/tdefile_elf.desktop
M tdehtml/java/kjavaappletviewer.desktop
M tdehtml/tdehtml.desktop
M tdehtml/tdehtmlimage.desktop
M tdehtml/tdemultipart/tdemultipart.desktop
M tdeio/kpasswdserver.desktop
M tdeio/misc/kpac/proxyscout.desktop
M tdeio/misc/kssld/kssld.desktop
M tdeio/misc/tdeio_uiserver.desktop
M tdeio/misc/tdewalletd/tdewalletd.desktop
M tdeio/tests/dummymeta.desktop
M tdeioslave/bzip2/kbzip2filter.desktop
M tdeioslave/gzip/kgzipfilter.desktop
M tdeioslave/http/kcookiejar/kcookiejar.desktop
M tdeioslave/iso/isoservice.desktop
M tdeioslave/iso/tdeio_iso.desktop
M tdeioslave/xz/kxzfilter.desktop
M tdeparts/tests/notepad.desktop
M tdeprint/tdeprintd.desktop
M tderesources/tderesources.desktop
M tdespell2/plugins/aspell/tdespell_aspell.desktop
M tdespell2/plugins/hspell/tdespell_hspell.desktop
M tdespell2/plugins/ispell/tdespell_ispell.desktop
M tdeui/kdetrayproxy/kdetrayproxy.desktop
 
diff --git a/arts/kde/mcop-dcop/kmcop.desktop b/arts/kde/mcop-dcop/kmcop.desktop
index 2243be9..972e6fe 100644
--- a/arts/kde/mcop-dcop/kmcop.desktop
+++ b/arts/kde/mcop-dcop/kmcop.desktop
@@ -85,6 +85,6 @@
 Comment[zh_TW]=TDE MCOP-DCOP ������
 Comment[zu]=Ibhulogo le-TDE MCOP-DCOP
 Icon=kmcop
-ServiceTypes=KMCOP
+X-TDE-ServiceTypes=KMCOP
 X-DCOP-ServiceType=Unique
 X-TDE-StartupNotify=false
diff --git a/arts/knotify/knotify.desktop b/arts/knotify/knotify.desktop
index 2041cde..7718c98 100644
--- a/arts/knotify/knotify.desktop
+++ b/arts/knotify/knotify.desktop
@@ -114,6 +114,6 @@
 Comment[zh_TW]=TDE ������������������
 Comment[zu]=Isaziso se-Daemon ye-TDE
 Icon=knotify
-ServiceTypes=KNotify
+X-TDE-ServiceTypes=KNotify
 X-DCOP-ServiceType=Unique
 X-TDE-StartupNotify=false
diff --git a/interfaces/tdescript/sample/shellscript.desktop b/interfaces/tdescript/sample/shellscript.desktop
index e65713a..e748a4d 100644
--- a/interfaces/tdescript/sample/shellscript.desktop
+++ b/interfaces/tdescript/sample/shellscript.desktop
@@ -73,7 +73,7 @@
 Type=Service
 X-TDE-Library=libshellscript
 X-TDE-Script-Runner=ShellScript/bash
-ServiceTypes=KScriptRunner/KScriptRunner
+X-TDE-ServiceTypes=KScriptRunner/KScriptRunner
 Comment=Runs bash shell scripts from inside the application.
 Comment[af]=Laai bash tolk skripte vanuit die program.
 Comment[ar]=���������� bash shell scripts ���� �������� ��������������
diff --git a/kate/data/katepart.desktop b/kate/data/katepart.desktop
index 3fa5479..95834df 100644
--- a/kate/data/katepart.desktop
+++ b/kate/data/katepart.desktop
@@ -84,7 +84,7 @@
 Name[zu]=Umlungisi Wezinga Eliphezulu Oshuthekiwe
 X-TDE-Library=libkatepart
 Icon=kate
-ServiceTypes=KParts/ReadOnlyPart,Browser/View,KParts/ReadWritePart,KTextEditor/Editor,KTextEditor/Document
+X-TDE-ServiceTypes=KParts/ReadOnlyPart,Browser/View,KParts/ReadWritePart,KTextEditor/Editor,KTextEditor/Document
 Type=Service
-InitialPreference=8
+X-TDE-InitialPreference=8
 MimeType=text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-shellscript;text/x-diff;text/x-adasrc;text/x-chdr;text/x-csrc;text/css;application/x-desktop;text/x-diff;text/x-fortran;text/html;text/x-java;text/x-tex;text/x-makefile;text/x-objcsrc;text/x-pascal;application/x-perl;text/x-perl;application/x-perl-module;application/x-php;text/vnd.wap.wml;application/x-python;text/x-python;application/x-ruby;text/sgml;text/xml;model/vrml
diff --git a/kate/plugins/autobookmarker/tdetexteditor_autobookmarker.desktop b/kate/plugins/autobookmarker/tdetexteditor_autobookmarker.desktop
index ea5b082..59aa060 100644
--- a/kate/plugins/autobookmarker/tdetexteditor_autobookmarker.desktop
+++ b/kate/plugins/autobookmarker/tdetexteditor_autobookmarker.desktop
@@ -129,7 +129,7 @@
 Comment[zh_CN]=���������������������������������������������������
 Comment[zh_TW]=���������������������������������������������������������
 X-TDE-Library=tdetexteditor_autobookmarker
-ServiceTypes=KTextEditor/Plugin
+X-TDE-ServiceTypes=KTextEditor/Plugin
 Type=Service
-InitialPreference=8
+X-TDE-InitialPreference=8
 MimeType=text/plain
diff --git a/kate/plugins/insertfile/tdetexteditor_insertfile.desktop b/kate/plugins/insertfile/tdetexteditor_insertfile.desktop
index 493369e..5c13035 100644
--- a/kate/plugins/insertfile/tdetexteditor_insertfile.desktop
+++ b/kate/plugins/insertfile/tdetexteditor_insertfile.desktop
@@ -150,7 +150,7 @@
 Comment[zh_HK]=���������������������������������
 Comment[zh_TW]=���������������������������������������
 X-TDE-Library=tdetexteditor_insertfile
-ServiceTypes=KTextEditor/Plugin
+X-TDE-ServiceTypes=KTextEditor/Plugin
 Type=Service
-InitialPreference=8
+X-TDE-InitialPreference=8
 MimeType=text/plain
diff --git a/kate/plugins/isearch/tdetexteditor_isearch.desktop b/kate/plugins/isearch/tdetexteditor_isearch.desktop
index 6fb7894..d4aca10 100644
--- a/kate/plugins/isearch/tdetexteditor_isearch.desktop
+++ b/kate/plugins/isearch/tdetexteditor_isearch.desktop
@@ -147,7 +147,7 @@
 Comment[zh_CN]=���������������������������
 Comment[zh_TW]=���������������������������
 X-TDE-Library=tdetexteditor_isearch
-ServiceTypes=KTextEditor/Plugin
+X-TDE-ServiceTypes=KTextEditor/Plugin
 Type=Service
-InitialPreference=8
+X-TDE-InitialPreference=8
 MimeType=text/plain
diff --git a/kate/plugins/kdatatool/tdetexteditor_kdatatool.desktop b/kate/plugins/kdatatool/tdetexteditor_kdatatool.desktop
index d8019c5..6f708d6 100644
--- a/kate/plugins/kdatatool/tdetexteditor_kdatatool.desktop
+++ b/kate/plugins/kdatatool/tdetexteditor_kdatatool.desktop
@@ -163,7 +163,7 @@
 Comment[zh_TW]=������������������������������������������������ (���������������������)
 Comment[zu]=Nika amandla amathuluzi edata  anjenge thesaurus kanye nokubheka ukubhalwa kwamagama (uma kufakiwe)
 X-TDE-Library=tdetexteditor_kdatatool
-ServiceTypes=KTextEditor/Plugin
+X-TDE-ServiceTypes=KTextEditor/Plugin
 Type=Service
-InitialPreference=8
+X-TDE-InitialPreference=8
 MimeType=text/plain
diff --git a/kate/plugins/wordcompletion/tdetexteditor_docwordcompletion.desktop b/kate/plugins/wordcompletion/tdetexteditor_docwordcompletion.desktop
index b18e1bf..934a0a7 100644
--- a/kate/plugins/wordcompletion/tdetexteditor_docwordcompletion.desktop
+++ b/kate/plugins/wordcompletion/tdetexteditor_docwordcompletion.desktop
@@ -133,7 +133,7 @@
 Comment[zh_CN]=���������������������������������������������
 Comment[zh_TW]=���������������������������������������
 X-TDE-Library=tdetexteditor_docwordcompletion
-ServiceTypes=KTextEditor/Plugin
+X-TDE-ServiceTypes=KTextEditor/Plugin
 Type=Service
-InitialPreference=8
+X-TDE-InitialPreference=8
 MimeType=text/plain
diff --git a/kded/test/test.desktop b/kded/test/test.desktop
index 51792b0..6503e1c 100644
--- a/kded/test/test.desktop
+++ b/kded/test/test.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Service
 
-ServiceTypes=KDEDModule
+X-TDE-ServiceTypes=KDEDModule
 X-TDE-ModuleType=Library
 X-TDE-Library=test
 X-TDE-Factory=test
diff --git a/networkstatus/networkstatus.desktop b/networkstatus/networkstatus.desktop
index 4d785b8..77a6125 100644
--- a/networkstatus/networkstatus.desktop
+++ b/networkstatus/networkstatus.desktop
@@ -91,7 +91,7 @@
 Comment[zh_CN]=���������������������������������������������������������������������
 Comment[zh_TW]=������������������������������������������������������������������������������
 Type=Service
-ServiceTypes=KDEDModule
+X-TDE-ServiceTypes=KDEDModule
 X-TDE-ModuleType=Library
 X-TDE-Library=networkstatus
 X-TDE-FactoryName=networkstatus
diff --git a/tdeabc/plugins/dir/dir.desktop b/tdeabc/plugins/dir/dir.desktop
index d78a2ed..e2c3581 100644
--- a/tdeabc/plugins/dir/dir.desktop
+++ b/tdeabc/plugins/dir/dir.desktop
@@ -87,6 +87,6 @@
 Name[zu]=Uhlu lwamafayela
 X-TDE-Library=tdeabc_dir
 Type=Service
-ServiceTypes=TDEResources/Plugin
+X-TDE-ServiceTypes=TDEResources/Plugin
 X-TDE-ResourceFamily=contact
 X-TDE-ResourceType=dir
diff --git a/tdeabc/plugins/evolution/evolution.desktop b/tdeabc/plugins/evolution/evolution.desktop
index 24407dd..4b47837 100644
--- a/tdeabc/plugins/evolution/evolution.desktop
+++ b/tdeabc/plugins/evolution/evolution.desktop
@@ -21,6 +21,6 @@
 Name[zu]=Evolushini
 X-TDE-Library=tdeabc_evo
 Type=Service
-ServiceTypes=TDEResources/Plugin
+X-TDE-ServiceTypes=TDEResources/Plugin
 X-TDE-ResourceFamily=contact
 X-TDE-ResourceType=evolution
diff --git a/tdeabc/plugins/file/file.desktop b/tdeabc/plugins/file/file.desktop
index 92afbb4..3625cc2 100644
--- a/tdeabc/plugins/file/file.desktop
+++ b/tdeabc/plugins/file/file.desktop
@@ -77,6 +77,6 @@
 Name[zh_TW]=������
 X-TDE-Library=tdeabc_file
 Type=Service
-ServiceTypes=TDEResources/Plugin
+X-TDE-ServiceTypes=TDEResources/Plugin
 X-TDE-ResourceFamily=contact
 X-TDE-ResourceType=file
diff --git a/tdeabc/plugins/ldaptdeio/ldaptdeio.desktop b/tdeabc/plugins/ldaptdeio/ldaptdeio.desktop
index 9530702..55b26ca 100644
--- a/tdeabc/plugins/ldaptdeio/ldaptdeio.desktop
+++ b/tdeabc/plugins/ldaptdeio/ldaptdeio.desktop
@@ -5,6 +5,6 @@
 Name[te]=������������������������
 X-TDE-Library=tdeabc_ldaptdeio
 Type=Service
-ServiceTypes=TDEResources/Plugin
+X-TDE-ServiceTypes=TDEResources/Plugin
 X-TDE-ResourceFamily=contact
 X-TDE-ResourceType=ldaptdeio
diff --git a/tdeabc/plugins/net/net.desktop b/tdeabc/plugins/net/net.desktop
index 7daa9ce..42f265e 100644
--- a/tdeabc/plugins/net/net.desktop
+++ b/tdeabc/plugins/net/net.desktop
@@ -85,6 +85,6 @@
 Name[zu]=Umsebenzi wokuxhumana okusakazekile
 X-TDE-Library=tdeabc_net
 Type=Service
-ServiceTypes=TDEResources/Plugin
+X-TDE-ServiceTypes=TDEResources/Plugin
 X-TDE-ResourceFamily=contact
 X-TDE-ResourceType=net
diff --git a/tdeabc/tdeabc_manager.desktop b/tdeabc/tdeabc_manager.desktop
index 533ccfb..52ea31d 100644
--- a/tdeabc/tdeabc_manager.desktop
+++ b/tdeabc/tdeabc_manager.desktop
@@ -71,6 +71,6 @@
 Name[zh_HK]=���������
 Name[zh_TW]=���������
 Type=Service
-ServiceTypes=TDEResources/Manager
+X-TDE-ServiceTypes=TDEResources/Manager
 
 X-TDE-ResourceFamily=contact
diff --git a/tdecert/tdecertpart.desktop b/tdecert/tdecertpart.desktop
index e447848..756d44c 100644
--- a/tdecert/tdecertpart.desktop
+++ b/tdecert/tdecertpart.desktop
@@ -94,6 +94,6 @@
 Name[ta]=������������������������������������������������
 Name[te]=������������������������ ������������������
 Name[ven]=Tshipida tsha cert ya K
-ServiceTypes=KParts/ReadWritePart
+X-TDE-ServiceTypes=KParts/ReadWritePart
 X-TDE-Library=libtdecertpart
-InitialPreference=15
+X-TDE-InitialPreference=15
diff --git a/tdefile-plugins/elf/tdefile_elf.desktop b/tdefile-plugins/elf/tdefile_elf.desktop
index 715ee92..b7cfe9a 100644
--- a/tdefile-plugins/elf/tdefile_elf.desktop
+++ b/tdefile-plugins/elf/tdefile_elf.desktop
@@ -59,7 +59,7 @@
 Name[zh_HK]=ELF ������
 Name[zh_TW]=ELF ������
 Name[zu]=Ulwazi lwe-ELF
-ServiceTypes=KFilePlugin
+X-TDE-ServiceTypes=KFilePlugin
 X-TDE-Library=tdefile_elf
 MimeType=application/x-executable;application/x-sharedlib
 PreferredItems=Name,Description,License,Copyright,Authors,Product,Organization,Version,DateTime,Notes"
diff --git a/tdehtml/java/kjavaappletviewer.desktop b/tdehtml/java/kjavaappletviewer.desktop
index 9a2d163..ea2bb6b 100644
--- a/tdehtml/java/kjavaappletviewer.desktop
+++ b/tdehtml/java/kjavaappletviewer.desktop
@@ -76,7 +76,7 @@
 ** Diff limit reached (max: 250 lines) **