Fix ServiceTypes, ExcludeServiceTypes, and DocPath desktop file entries to match XDG specifications

27 files changed, 30 insertions, 30 deletions

diff --git a/konq-plugins/akregator/akregator_konqplugin.desktop b/konq-plugins/akregator/akregator_konqplugin.desktop
index 6d7021e..594da75 100644
--- a/konq-plugins/akregator/akregator_konqplugin.desktop
+++ b/konq-plugins/akregator/akregator_konqplugin.desktop
@@ -51,4 +51,4 @@ Name[vi]=Thêm nguồn tin vào Akregator
 Name[zh_CN]=在 Akregator 中添加种子
 Name[zh_TW]=將 Feed 加入 Akregator
 X-TDE-Library=libakregatorkonqplugin
-ServiceTypes=KonqPopupMenu/Plugin,all/all
+X-TDE-ServiceTypes=KonqPopupMenu/Plugin,all/all
diff --git a/konq-plugins/arkplugin/ark_plugin.desktop b/konq-plugins/arkplugin/ark_plugin.desktop
index 89f6f4c..58d3699 100644
--- a/konq-plugins/arkplugin/ark_plugin.desktop
+++ b/konq-plugins/arkplugin/ark_plugin.desktop
@@ -56,4 +56,4 @@ Name[vi]=Nén/Giải nén tập tin
 Name[zh_CN]=压缩/解压文件
 Name[zh_TW]=壓縮/解壓縮檔案
 X-TDE-Library=libarkplugin
-ServiceTypes=KonqPopupMenu/Plugin,all/all
+X-TDE-ServiceTypes=KonqPopupMenu/Plugin,all/all
diff --git a/konq-plugins/arkplugin/arkplugin.desktop b/konq-plugins/arkplugin/arkplugin.desktop
index 609cb35..2f6b044 100644
--- a/konq-plugins/arkplugin/arkplugin.desktop
+++ b/konq-plugins/arkplugin/arkplugin.desktop
@@ -56,4 +56,4 @@ Name[zh_CN]=用 Ark 压缩/解压文件
 Name[zh_TW]=以 Ark 壓縮/解壓縮檔案
 Icon=ark
 X-TDE-ParentApp=konqueror
-DocPath=ark/index.html
+X-DocPath=ark/index.html
diff --git a/konq-plugins/babelfish/plugin_babelfish.desktop b/konq-plugins/babelfish/plugin_babelfish.desktop
index 623a105..12f6695 100644
--- a/konq-plugins/babelfish/plugin_babelfish.desktop
+++ b/konq-plugins/babelfish/plugin_babelfish.desktop
@@ -123,4 +123,4 @@ Comment[zh_CN]=Babelfish 插件
 Comment[zh_TW]=Babelfish 外掛程式
 Icon=babelfish
 X-TDE-ParentApp=konqueror
-DocPath=konq-plugins/babel/index.html
+X-DocPath=konq-plugins/babel/index.html
diff --git a/konq-plugins/crashes/crashesplugin.desktop b/konq-plugins/crashes/crashesplugin.desktop
index 96a49f6..1ef344f 100644
--- a/konq-plugins/crashes/crashesplugin.desktop
+++ b/konq-plugins/crashes/crashesplugin.desktop
@@ -121,4 +121,4 @@ Comment[zh_CN]=崩溃监视器
 Comment[zh_TW]=當機監視器
 X-TDE-ParentApp=konqueror
 Icon=core
-DocPath=konq-plugins/crashes/index.html
+X-DocPath=konq-plugins/crashes/index.html
diff --git a/konq-plugins/dirfilter/dirfilter_plugin.desktop b/konq-plugins/dirfilter/dirfilter_plugin.desktop
index 35e5b9b..bd7da6a 100644
--- a/konq-plugins/dirfilter/dirfilter_plugin.desktop
+++ b/konq-plugins/dirfilter/dirfilter_plugin.desktop
@@ -121,4 +121,4 @@ Comment[zh_CN]=目录过滤器插件
 Comment[zh_TW]=目錄過濾器外掛程式
 Icon=filter
 X-TDE-ParentApp=konqueror
-DocPath=konq-plugins/dirfilter/index.html
+X-DocPath=konq-plugins/dirfilter/index.html
diff --git a/konq-plugins/dirfilter/dirfilterplugin.desktop b/konq-plugins/dirfilter/dirfilterplugin.desktop
index 4b2e814..77e8dc7 100644
--- a/konq-plugins/dirfilter/dirfilterplugin.desktop
+++ b/konq-plugins/dirfilter/dirfilterplugin.desktop
@@ -121,4 +121,4 @@ Comment[zh_CN]=目录过滤器插件
 Comment[zh_TW]=目錄過濾器外掛程式
 Icon=filter
 X-TDE-ParentApp=konqueror
-DocPath=konq-plugins/dirfilter/index.html
+X-DocPath=konq-plugins/dirfilter/index.html
diff --git a/konq-plugins/domtreeviewer/plugin_domtreeviewer.desktop b/konq-plugins/domtreeviewer/plugin_domtreeviewer.desktop
index f86ecc1..bdb3df1 100644
--- a/konq-plugins/domtreeviewer/plugin_domtreeviewer.desktop
+++ b/konq-plugins/domtreeviewer/plugin_domtreeviewer.desktop
@@ -125,4 +125,4 @@ Comment[zh_CN]=DOM 树形视图查看器
 Comment[zh_TW]=DOM 樹檢視器
 Icon=domtreeviewer
 X-TDE-ParentApp=konqueror
-DocPath=konq-plugins/domtreeviewer/index.html
+X-DocPath=konq-plugins/domtreeviewer/index.html
diff --git a/konq-plugins/fsview/fsview.desktop b/konq-plugins/fsview/fsview.desktop
index 1ca24ee..d7bd0f1 100644
--- a/konq-plugins/fsview/fsview.desktop
+++ b/konq-plugins/fsview/fsview.desktop
@@ -3,7 +3,7 @@ Type=Application
 Exec=fsview -caption "%c" %i %m %u
 MimeType=inode/directory
 Icon=fsview
-DocPath=konq-plugins/fsview/index.html
+X-DocPath=konq-plugins/fsview/index.html
 Terminal=false
 Name=FSView
 GenericName=File Size Viewer
diff --git a/konq-plugins/fsview/fsview_part.desktop b/konq-plugins/fsview/fsview_part.desktop
index 74c6f70..4edc8ab 100644
--- a/konq-plugins/fsview/fsview_part.desktop
+++ b/konq-plugins/fsview/fsview_part.desktop
@@ -51,8 +51,8 @@ Name[vi]=Xem cỡ tập tin
 Name[zh_CN]=文件大小查看
 Name[zh_TW]=檔案大小檢視器
 MimeType=inode/directory
-ServiceTypes=KParts/ReadOnlyPart
+X-TDE-ServiceTypes=KParts/ReadOnlyPart
 X-TDE-Library=libfsviewpart
 Type=Service
 Icon=fsview
-DocPath=konq-plugins/fsview/index.html
+X-DocPath=konq-plugins/fsview/index.html
diff --git a/konq-plugins/imagerotation/imageconverter.desktop b/konq-plugins/imagerotation/imageconverter.desktop
index a54279e..1876a07 100644
--- a/konq-plugins/imagerotation/imageconverter.desktop
+++ b/konq-plugins/imagerotation/imageconverter.desktop
@@ -3,7 +3,7 @@
 # Released under the same license as the KDE core distribution (GPL 2.0).
 #
 [Desktop Entry]
-ServiceTypes=image/*
+X-TDE-ServiceTypes=image/*
 Actions=convToJPEG;convToPNG;convToGIF;convToTIF;
 X-TDE-Submenu=Convert To
 X-TDE-Submenu[bg]=Конвертиране в
diff --git a/konq-plugins/imagerotation/jpegorient.desktop b/konq-plugins/imagerotation/jpegorient.desktop
index d9a9677..bed67a9 100644
--- a/konq-plugins/imagerotation/jpegorient.desktop
+++ b/konq-plugins/imagerotation/jpegorient.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-ServiceTypes=image/jpeg
+X-TDE-ServiceTypes=image/jpeg
 Actions=jpegRot90;jpegRot270;jpegFlipV;jpegFlipH;
 X-TDE-Submenu=Transform Image
 X-TDE-Submenu[bg]=Конвертиране на изображението
diff --git a/konq-plugins/kimgalleryplugin/kimgalleryplugin.desktop b/konq-plugins/kimgalleryplugin/kimgalleryplugin.desktop
index 0e03feb..c804b65 100644
--- a/konq-plugins/kimgalleryplugin/kimgalleryplugin.desktop
+++ b/konq-plugins/kimgalleryplugin/kimgalleryplugin.desktop
@@ -126,4 +126,4 @@ Comment[zh_CN]=生成 HTML 图像集的简捷方式
 Comment[zh_TW]=簡單建立 HTML 相簿的方法
 Icon=imagegallery
 X-TDE-ParentApp=konqueror
-DocPath=konq-plugins/imgallery/index.html
+X-DocPath=konq-plugins/imgallery/index.html
diff --git a/konq-plugins/kuick/kcmkuick/kcmkuick.desktop b/konq-plugins/kuick/kcmkuick/kcmkuick.desktop
index 7da07bc..d0dc040 100644
--- a/konq-plugins/kuick/kcmkuick/kcmkuick.desktop
+++ b/konq-plugins/kuick/kcmkuick/kcmkuick.desktop
@@ -199,4 +199,4 @@ Keywords[xh]=kuick;khuphela;hambisa
 Keywords[zh_CN]=kuick;copy;move;复制;移动
 Keywords[zu]=kuick;khiphela;susa
 X-TDE-ParentApp=kcontrol
-DocPath=konq-plugins/kuick/index.html
+X-DocPath=konq-plugins/kuick/index.html
diff --git a/konq-plugins/kuick/kuick_plugin.desktop b/konq-plugins/kuick/kuick_plugin.desktop
index ffab27f..dba182c 100644
--- a/konq-plugins/kuick/kuick_plugin.desktop
+++ b/konq-plugins/kuick/kuick_plugin.desktop
@@ -64,4 +64,4 @@ Name[zh_TW]=Kuick 複製與移動
 Name[zu]=Kuick Khiphela futhi Ususe
 Icon=tdemultiple
 X-TDE-Library=libkuickplugin
-ServiceTypes=KonqPopupMenu/Plugin,all/all
+X-TDE-ServiceTypes=KonqPopupMenu/Plugin,all/all
diff --git a/konq-plugins/kuick/kuickplugin.desktop b/konq-plugins/kuick/kuickplugin.desktop
index f015481..7af2c7d 100644
--- a/konq-plugins/kuick/kuickplugin.desktop
+++ b/konq-plugins/kuick/kuickplugin.desktop
@@ -63,4 +63,4 @@ Name[zh_TW]=Kuick 複製與移動
 Name[zu]=Kuick Khiphela futhi Ususe
 Icon=tdemultiple
 X-TDE-ParentApp=konqueror
-DocPath=konq-plugins/kuick/index.html
+X-DocPath=konq-plugins/kuick/index.html
diff --git a/konq-plugins/mediarealfolder/media_realfolder.desktop b/konq-plugins/mediarealfolder/media_realfolder.desktop
index d276884..830c5f9 100644
--- a/konq-plugins/mediarealfolder/media_realfolder.desktop
+++ b/konq-plugins/mediarealfolder/media_realfolder.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-ServiceTypes=media/cdrom_mounted,media/cdwriter_mounted,media/dvd_mounted,media/floppy5_mounted,media/floppy_mounted,media/hdd_mounted,media/nfs_mounted,media/smb_mounted,media/removable_mounted,media/zip_mounted
+X-TDE-ServiceTypes=media/cdrom_mounted,media/cdwriter_mounted,media/dvd_mounted,media/floppy5_mounted,media/floppy_mounted,media/hdd_mounted,media/nfs_mounted,media/smb_mounted,media/removable_mounted,media/zip_mounted
 Actions=MediaRealFolder
 X-TDE-Priority=TopLevel
 X-TDE-MediaNotifierHide=true
diff --git a/konq-plugins/minitools/minitoolsplugin.desktop b/konq-plugins/minitools/minitoolsplugin.desktop
index 0de8a33..0f602e1 100644
--- a/konq-plugins/minitools/minitoolsplugin.desktop
+++ b/konq-plugins/minitools/minitoolsplugin.desktop
@@ -118,4 +118,4 @@ Comment[uk]=Міні-засоби
 Comment[vi]=Công cụ nhỏ
 Comment[zh_CN]=小工具
 X-TDE-ParentApp=konqueror
-DocPath=konq-plugins/minitools/index.html
+X-DocPath=konq-plugins/minitools/index.html
diff --git a/konq-plugins/rsync/rsync_plugin.desktop b/konq-plugins/rsync/rsync_plugin.desktop
index 74b09d3..448fa36 100644
--- a/konq-plugins/rsync/rsync_plugin.desktop
+++ b/konq-plugins/rsync/rsync_plugin.desktop
@@ -14,4 +14,4 @@ Name=Remote Folder Synchronization Plugin
 Comment=Remote folder synchronization plugin
 Icon=remotesync
 X-TDE-ParentApp=konqueror
-DocPath=konq-plugins/rsync/index.html
+X-DocPath=konq-plugins/rsync/index.html
diff --git a/konq-plugins/rsync/rsyncplugin.desktop b/konq-plugins/rsync/rsyncplugin.desktop
index 0251090..6da2b55 100644
--- a/konq-plugins/rsync/rsyncplugin.desktop
+++ b/konq-plugins/rsync/rsyncplugin.desktop
@@ -12,4 +12,4 @@ Name=Remote Folder Synchronization Plugin
 Comment=Remote folder synchronization plugin
 Icon=remotesync
 X-TDE-ParentApp=konqueror
-DocPath=konq-plugins/rsync/index.html
+X-DocPath=konq-plugins/rsync/index.html
diff --git a/konq-plugins/sidebar/mediaplayer/mediaplayerplugin.desktop b/konq-plugins/sidebar/mediaplayer/mediaplayerplugin.desktop
index 8fb14ef..36670fe 100644
--- a/konq-plugins/sidebar/mediaplayer/mediaplayerplugin.desktop
+++ b/konq-plugins/sidebar/mediaplayer/mediaplayerplugin.desktop
@@ -112,4 +112,4 @@ Comment[zh_TW]=在 Konqueror 導覽面板上的媒體播放器外掛程式
 Icon=konqsidebar_mediaplayer
 X-TDE-ParentApp=konqueror
 X-TDE-KonqSidebarUniversal=true
-DocPath=konq-plugins/mediaplayer/index.html
+X-DocPath=konq-plugins/mediaplayer/index.html
diff --git a/konq-plugins/sidebar/metabar/src/serviceloader.cpp b/konq-plugins/sidebar/metabar/src/serviceloader.cpp
index 167009e..3ff2e88 100644
--- a/konq-plugins/sidebar/metabar/src/serviceloader.cpp
+++ b/konq-plugins/sidebar/metabar/src/serviceloader.cpp
@@ -101,9 +101,9 @@ void ServiceLoader::loadServices(const KFileItem item, DOM::DOMString &html, int
         }
       }
 
-      if ( cfg.hasKey( "Actions" ) && cfg.hasKey( "ServiceTypes" ) ){
-          const TQStringList types = cfg.readListEntry( "ServiceTypes" );
-          const TQStringList excludeTypes = cfg.readListEntry( "ExcludeServiceTypes" );
+      if ( cfg.hasKey( "Actions" ) && cfg.hasKey( "X-TDE-ServiceTypes" ) ){
+          const TQStringList types = cfg.readListEntry( "X-TDE-ServiceTypes" );
+          const TQStringList excludeTypes = cfg.readListEntry( "X-TDE-ExcludeServiceTypes" );
           bool ok = false;
 
           for (TQStringList::ConstIterator it = types.begin(); it != types.end() && !ok; ++it){
diff --git a/konq-plugins/tdehtmlsettingsplugin/tdehtmlsettingsplugin.desktop b/konq-plugins/tdehtmlsettingsplugin/tdehtmlsettingsplugin.desktop
index 417f0b9..fd28d4e 100644
--- a/konq-plugins/tdehtmlsettingsplugin/tdehtmlsettingsplugin.desktop
+++ b/konq-plugins/tdehtmlsettingsplugin/tdehtmlsettingsplugin.desktop
@@ -133,4 +133,4 @@ Comment[zh_CN]=改变 TDEHTML 设置的快速方式
 Comment[zh_TW]=快速變更 TDEHTML 設定的方法
 X-TDE-ParentApp=konqueror
 Icon=configure
-DocPath=konq-plugins/tdehtmlsettings/index.html
+X-DocPath=konq-plugins/tdehtmlsettings/index.html
diff --git a/konq-plugins/uachanger/uachangerplugin.desktop b/konq-plugins/uachanger/uachangerplugin.desktop
index 962b2f1..7999d77 100644
--- a/konq-plugins/uachanger/uachangerplugin.desktop
+++ b/konq-plugins/uachanger/uachangerplugin.desktop
@@ -118,4 +118,4 @@ Comment[zh_CN]=用来更换用户代理的插件
 Comment[zh_TW]=改變使用者代理人的外掛程式
 X-TDE-ParentApp=konqueror
 Icon=agent
-DocPath=konq-plugins/uachanger/index.html
+X-DocPath=konq-plugins/uachanger/index.html
diff --git a/konq-plugins/validators/plugin_validators.desktop b/konq-plugins/validators/plugin_validators.desktop
index bf9874d..5a56a8d 100644
--- a/konq-plugins/validators/plugin_validators.desktop
+++ b/konq-plugins/validators/plugin_validators.desktop
@@ -125,4 +125,4 @@ Comment[zh_CN]=CSS 和 HTML 校验插件
 Comment[zh_TW]=CSS 與 HTML 驗證外掛程式
 Icon=validators
 X-TDE-ParentApp=konqueror
-DocPath=konq-plugins/validators/index.html
+X-DocPath=konq-plugins/validators/index.html
diff --git a/konq-plugins/webarchiver/plugin_webarchiver.desktop b/konq-plugins/webarchiver/plugin_webarchiver.desktop
index 0ed2c26..0134d95 100644
--- a/konq-plugins/webarchiver/plugin_webarchiver.desktop
+++ b/konq-plugins/webarchiver/plugin_webarchiver.desktop
@@ -127,4 +127,4 @@ Comment[zh_CN]=创建网站存档
 Comment[zh_TW]=建立網站的檔案
 Icon=webarchiver
 X-TDE-ParentApp=konqueror
-DocPath=konq-plugins/webarchiver/index.html
+X-DocPath=konq-plugins/webarchiver/index.html
diff --git a/konq-plugins/webarchiver/webarchivethumbnail.desktop b/konq-plugins/webarchiver/webarchivethumbnail.desktop
index 6759e62..9f8d0a7 100644
--- a/konq-plugins/webarchiver/webarchivethumbnail.desktop
+++ b/konq-plugins/webarchiver/webarchivethumbnail.desktop
@@ -70,7 +70,7 @@ Name[xh]=Iindawo zokugcina ze web
 Name[zh_CN]=Web 存档
 Name[zh_TW]=Web 檔案館
 Name[zu]=Ushicilelo lukawonke umuntu kanye nemiqulu emidala yeWeb
-ServiceTypes=ThumbCreator
+X-TDE-ServiceTypes=ThumbCreator
 MimeTypes=application/x-webarchive
 X-TDE-Library=webarchivethumbnail
 CacheThumbnail=true