Branch: master

bc20d74c 2014-10-11 17:19:23 Timothy Pearson
Fix ServiceTypes, ExcludeServiceTypes, and DocPath desktop file entries to match XDG specifications
M arts/builder/artsbuilder.desktop
M arts/tools/artscontrol.desktop
M juk/juk.desktop
M juk/jukservicemenu.desktop
M kaboodle/kaboodle.desktop
M kaboodle/kaboodle_component.desktop
M kaboodle/kaboodleengine.desktop
M kappfinder-data/meterbridge.desktop
M kaudiocreator/audiocd_extract.desktop
M kaudiocreator/kaudiocreator.desktop
M kmix/kmix.desktop
M krec/kcm_krec.desktop
M krec/kcm_krec_files.desktop
M krec/krec.desktop
M krec/krec_exportwave.desktop
M krec/mp3_export/krec_exportmp3.desktop
M krec/ogg_export/krec_exportogg.desktop
M kscd/audiocd_play.desktop
M kscd/kscd.desktop
M libkcddb/kcmcddb/libkcddb.desktop
M noatun/noatun.desktop
M tdefile-plugins/au/tdefile_au.desktop
M tdefile-plugins/avi/tdefile_avi.desktop
M tdefile-plugins/flac/tdefile_flac.desktop
M tdefile-plugins/m3u/tdefile_m3u.desktop
M tdefile-plugins/mp3/tdefile_mp3.desktop
M tdefile-plugins/mpc/tdefile_mpc.desktop
M tdefile-plugins/mpeg/tdefile_mpeg.desktop
M tdefile-plugins/ogg/tdefile_ogg.desktop
M tdefile-plugins/sid/tdefile_sid.desktop
M tdefile-plugins/theora/tdefile_theora.desktop
M tdefile-plugins/wav/tdefile_wav.desktop
M tdeioslave/audiocd/kcmaudiocd/audiocd.desktop
M tdemid/tdemid.desktop
M xine_artsplugin/tools/thumbnail/videothumbnail.desktop
diff --git a/arts/builder/artsbuilder.desktop b/arts/builder/artsbuilder.desktop
index 745a995..766f656 100644
--- a/arts/builder/artsbuilder.desktop
+++ b/arts/builder/artsbuilder.desktop
@@ -115,7 +115,7 @@
 Type=Application
 Terminal=false
 MimeType=application/x-artsbuilder;
-DocPath=artsbuilder/index.html
+X-DocPath=artsbuilder/index.html
 X-DCOP-ServiceType=Multi
 OnlyShowIn=TDE;
 Categories=Qt;TDE;AudioVideo;
diff --git a/arts/tools/artscontrol.desktop b/arts/tools/artscontrol.desktop
index 743d07b..dbfbd44 100644
--- a/arts/tools/artscontrol.desktop
+++ b/arts/tools/artscontrol.desktop
@@ -131,7 +131,7 @@
 Type=Application
 Terminal=false
 X-DCOP-ServiceType=Multi
-DocPath=artsbuilder/index.html
+X-DocPath=artsbuilder/index.html
 OnlyShowIn=TDE;
 Categories=Qt;TDE;AudioVideo;
 NoDisplay=true
diff --git a/juk/juk.desktop b/juk/juk.desktop
index 93924e6..d4a62a9 100644
--- a/juk/juk.desktop
+++ b/juk/juk.desktop
@@ -2,7 +2,7 @@
 Type=Application
 Exec=juk -caption "%c" %i %m
 Icon=juk
-DocPath=juk/index.html
+X-DocPath=juk/index.html
 Comment=
 Terminal=false
 Name=JuK
diff --git a/juk/jukservicemenu.desktop b/juk/jukservicemenu.desktop
index 942a6a4..0c05296 100644
--- a/juk/jukservicemenu.desktop
+++ b/juk/jukservicemenu.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-ServiceTypes=application/ogg,audio/vorbis,audio/x-mp3,audio/x-flac,audio/x-oggflac,audio/x-musepack
+X-TDE-ServiceTypes=application/ogg,audio/vorbis,audio/x-mp3,audio/x-flac,audio/x-oggflac,audio/x-musepack
 Actions=addToCollection
 
 [Desktop Action addToCollection]
diff --git a/kaboodle/kaboodle.desktop b/kaboodle/kaboodle.desktop
index 626deca..cff5f1c 100644
--- a/kaboodle/kaboodle.desktop
+++ b/kaboodle/kaboodle.desktop
@@ -78,7 +78,7 @@
 GenericName[zh_TW]=���������������
 GenericName[zu]=Umdlali Womculo
 Terminal=false
-InitialPreference=6
+X-TDE-InitialPreference=6
 X-DCOP-ServiceType=Multi
 Categories=Qt;TDE;AudioVideo;
-DocPath=kaboodle/index.html
+X-DocPath=kaboodle/index.html
diff --git a/kaboodle/kaboodle_component.desktop b/kaboodle/kaboodle_component.desktop
index 9088315..670ded9 100644
--- a/kaboodle/kaboodle_component.desktop
+++ b/kaboodle/kaboodle_component.desktop
@@ -67,6 +67,6 @@
 Icon=kaboodle
 # Keep in sync with the audio types in kaboodle.desktop
 MimeType=audio/x-mp3;application/ogg;audio/x-mp2;video/mpeg;audio/x-wav;audio/x-mod;video/x-msvideo;video/quicktime;video/x-flic;audio/basic;video/x-ms-asf;video/x-flv
-ServiceTypes=KParts/ReadOnlyPart,Browser/View,KMediaPlayer/Player
+X-TDE-ServiceTypes=KParts/ReadOnlyPart,Browser/View,KMediaPlayer/Player
 Type=Service
-InitialPreference=8
+X-TDE-InitialPreference=8
diff --git a/kaboodle/kaboodleengine.desktop b/kaboodle/kaboodleengine.desktop
index a8d62a5..4544146 100644
--- a/kaboodle/kaboodleengine.desktop
+++ b/kaboodle/kaboodleengine.desktop
@@ -62,6 +62,6 @@
 Icon=kaboodle
 # Keep in sync with the audio types in kaboodle.desktop
 MimeType=audio/x-mp3;application/ogg;audio/x-mp2;video/mpeg;audio/x-wav;audio/x-mod;video/x-msvideo;video/quicktime;video/x-flic;audio/basic;video/x-ms-asf;video/x-flv
-ServiceTypes=KMediaPlayer/Engine
+X-TDE-ServiceTypes=KMediaPlayer/Engine
 Type=Service
-InitialPreference=8
+X-TDE-InitialPreference=8
diff --git a/kappfinder-data/meterbridge.desktop b/kappfinder-data/meterbridge.desktop
index 91774bb..7dc4b03 100644
--- a/kappfinder-data/meterbridge.desktop
+++ b/kappfinder-data/meterbridge.desktop
@@ -3,7 +3,7 @@
 Exec=meterbridge -t vu in_1 in_2
 Icon=
 Path=
-DocPath=
+X-DocPath=
 Terminal=false
 GenericName=Dual Channel VU-Meter
 GenericName[ca]=Mesurador VU de canal dual
diff --git a/kaudiocreator/audiocd_extract.desktop b/kaudiocreator/audiocd_extract.desktop
index 2dd5f42..54bfd48 100644
--- a/kaudiocreator/audiocd_extract.desktop
+++ b/kaudiocreator/audiocd_extract.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-ServiceTypes=media/audiocd
+X-TDE-ServiceTypes=media/audiocd
 Actions=Extract;
 X-TDE-Priority=TopLevel
 
diff --git a/kaudiocreator/kaudiocreator.desktop b/kaudiocreator/kaudiocreator.desktop
index d2d3b98..a9f716e 100644
--- a/kaudiocreator/kaudiocreator.desktop
+++ b/kaudiocreator/kaudiocreator.desktop
@@ -135,4 +135,4 @@
 Type=Application
 Terminal=false
 Categories=Qt;TDE;AudioVideo;Audio;
-DocPath=kaudiocreator/index.html
+X-DocPath=kaudiocreator/index.html
diff --git a/kmix/kmix.desktop b/kmix/kmix.desktop
index a7175cf..7b5a68a 100644
--- a/kmix/kmix.desktop
+++ b/kmix/kmix.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=kmix -caption "%c" %i %m
-DocPath=kmix/index.html
+X-DocPath=kmix/index.html
 OnlyShowIn=TDE;
 Path=
 Type=Application
diff --git a/krec/kcm_krec.desktop b/krec/kcm_krec.desktop
index b3eae3d..06fa4ca 100644
--- a/krec/kcm_krec.desktop
+++ b/krec/kcm_krec.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=krec
 Type=Service
-ServiceTypes=TDECModule
+X-TDE-ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=krec
diff --git a/krec/kcm_krec_files.desktop b/krec/kcm_krec_files.desktop
index 3d2949e..cf2cdd8 100644
--- a/krec/kcm_krec_files.desktop
+++ b/krec/kcm_krec_files.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=filenew
 Type=Service
-ServiceTypes=TDECModule
+X-TDE-ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=krec_files
diff --git a/krec/krec.desktop b/krec/krec.desktop
index 4a39a94..39fa734 100644
--- a/krec/krec.desktop
+++ b/krec/krec.desktop
@@ -3,7 +3,7 @@
 Exec=krec %i %m -caption "%c"
 Icon=krec
 Path=
-DocPath=krec/index.html
+X-DocPath=krec/index.html
 Terminal=false
 GenericName=Recording Tool
 GenericName[af]=Opneem Program
diff --git a/krec/krec_exportwave.desktop b/krec/krec_exportwave.desktop
index 067b12a..2753b47 100644
--- a/krec/krec_exportwave.desktop
+++ b/krec/krec_exportwave.desktop
@@ -53,5 +53,5 @@
 Name[zh_HK]=Wave-������
 Name[zh_TW]=Wave ������
 X-TDE-Library=libkrecexport_wave
-ServiceTypes=KRec/exportplugin
+X-TDE-ServiceTypes=KRec/exportplugin
 X-TDE-ExportSuffix=wav,WAV
diff --git a/krec/mp3_export/krec_exportmp3.desktop b/krec/mp3_export/krec_exportmp3.desktop
index 8565836..8e388b3 100644
--- a/krec/mp3_export/krec_exportmp3.desktop
+++ b/krec/mp3_export/krec_exportmp3.desktop
@@ -55,5 +55,5 @@
 Name[zh_HK]=MP3-������
 Name[zh_TW]=MP3 ������
 X-TDE-Library=libkrecexport_mp3
-ServiceTypes=KRec/exportplugin
+X-TDE-ServiceTypes=KRec/exportplugin
 X-TDE-ExportSuffix=mp3,MP3
diff --git a/krec/ogg_export/krec_exportogg.desktop b/krec/ogg_export/krec_exportogg.desktop
index 2f3a72c..7a56cf2 100644
--- a/krec/ogg_export/krec_exportogg.desktop
+++ b/krec/ogg_export/krec_exportogg.desktop
@@ -56,5 +56,5 @@
 Name[zh_HK]=OGG-������
 Name[zh_TW]=OGG ������
 X-TDE-Library=libkrecexport_ogg
-ServiceTypes=KRec/exportplugin
+X-TDE-ServiceTypes=KRec/exportplugin
 X-TDE-ExportSuffix=ogg,OGG
diff --git a/kscd/audiocd_play.desktop b/kscd/audiocd_play.desktop
index 9cdb345..1fca3f9 100644
--- a/kscd/audiocd_play.desktop
+++ b/kscd/audiocd_play.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-ServiceTypes=media/audiocd
+X-TDE-ServiceTypes=media/audiocd
 Actions=Play;
 X-TDE-Priority=TopLevel
 
diff --git a/kscd/kscd.desktop b/kscd/kscd.desktop
index c763c86..441a348 100644
--- a/kscd/kscd.desktop
+++ b/kscd/kscd.desktop
@@ -75,7 +75,7 @@
 Name[tr]=Kscd
 Name[zh_TW]=KsCD ���������
 Exec=kscd -caption "%c" %i %m
-DocPath=kscd/index.html
+X-DocPath=kscd/index.html
 Icon=kscd
 Path=
 Type=Application
diff --git a/libkcddb/kcmcddb/libkcddb.desktop b/libkcddb/kcmcddb/libkcddb.desktop
index 8b11635..74eb7dc 100644
--- a/libkcddb/kcmcddb/libkcddb.desktop
+++ b/libkcddb/kcmcddb/libkcddb.desktop
@@ -4,7 +4,7 @@
 Type=Application
 X-TDE-ModuleType=Library
 X-TDE-Library=cddb
-DocPath=kcontrol/cddb/index.html
+X-DocPath=kcontrol/cddb/index.html
 OnlyShowIn=TDE;
 
 Name=CDDB Retrieval
diff --git a/noatun/noatun.desktop b/noatun/noatun.desktop
index d4e740e..cc760da 100644
--- a/noatun/noatun.desktop
+++ b/noatun/noatun.desktop
@@ -10,7 +10,7 @@
 ** Diff limit reached (max: 250 lines) **