Branch: master

c31057da 2014-10-11 17:19:23 Timothy Pearson
Fix ServiceTypes, ExcludeServiceTypes, and DocPath desktop file entries to match XDG specifications
M filesharing/advanced/kcm_sambaconf/kcmsambaconf.desktop
M filesharing/advanced/propsdlgplugin/fileshare_propsdlgplugin.desktop
M filesharing/simple/fileshare.desktop
M kdict/kdict.desktop
M kget/kget.desktop
M kget/kget_download.desktop
M knewsticker/knewsticker-standalone.desktop
M knewsticker/knewsticker.desktop
M knewsticker/knewstickerstub/knewstickerstub.desktop
M knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.desktop
M kopete/kopete/chatwindow/chatwindow.desktop
M kopete/kopete/chatwindow/emailwindow.desktop
M kopete/kopete/config/accounts/kopete_accountconfig.desktop
M kopete/kopete/config/appearance/kopete_appearanceconfig.desktop
M kopete/kopete/config/avdevice/kopete_avdeviceconfig.desktop
M kopete/kopete/config/behavior/kopete_behaviorconfig.desktop
M kopete/kopete/config/identity/kopete_identityconfig.desktop
M kopete/kopete/kopete.desktop
M kopete/plugins/addbookmarks/kopete_addbookmarks.desktop
M kopete/plugins/addbookmarks/kopete_addbookmarks_config.desktop
M kopete/plugins/alias/kopete_alias.desktop
M kopete/plugins/alias/kopete_alias_config.desktop
M kopete/plugins/autoreplace/kopete_autoreplace.desktop
M kopete/plugins/autoreplace/kopete_autoreplace_config.desktop
M kopete/plugins/connectionstatus/kopete_connectionstatus.desktop
M kopete/plugins/contactnotes/kopete_contactnotes.desktop
M kopete/plugins/cryptography/kopete_cryptography.desktop
M kopete/plugins/cryptography/kopete_cryptography_config.desktop
M kopete/plugins/highlight/kopete_highlight.desktop
M kopete/plugins/highlight/kopete_highlight_config.desktop
M kopete/plugins/history/kopete_history.desktop
M kopete/plugins/history/kopete_history_config.desktop
M kopete/plugins/latex/kopete_latex.desktop
M kopete/plugins/latex/kopete_latex_config.desktop
M kopete/plugins/motionautoaway/kopete_motionaway.desktop
M kopete/plugins/motionautoaway/kopete_motionaway_config.desktop
M kopete/plugins/nowlistening/kopete_nowlistening.desktop
M kopete/plugins/nowlistening/kopete_nowlistening_config.desktop
M kopete/plugins/smpppdcs/kopete_smpppdcs.desktop
M kopete/plugins/smpppdcs/kopete_smpppdcs_config.desktop
M kopete/plugins/statistics/kopete_statistics.desktop
M kopete/plugins/texteffect/kopete_texteffect.desktop
M kopete/plugins/texteffect/kopete_texteffect_config.desktop
M kopete/plugins/translator/kopete_translator.desktop
M kopete/plugins/translator/kopete_translator_config.desktop
M kopete/plugins/webpresence/kopete_webpresence.desktop
M kopete/plugins/webpresence/kopete_webpresence_config.desktop
M kopete/protocols/gadu/kopete_gadu.desktop
M kopete/protocols/groupwise/kopete_groupwise.desktop
M kopete/protocols/irc/kopete_irc.desktop
M kopete/protocols/jabber/kopete_jabber.desktop
M kopete/protocols/meanwhile/kopete_meanwhile.desktop
M kopete/protocols/oscar/aim/kopete_aim.desktop
M kopete/protocols/oscar/icq/kopete_icq.desktop
M kopete/protocols/sms/kopete_sms.desktop
M kopete/protocols/testbed/kopete_testbed.desktop
M kopete/protocols/winpopup/kopete_wp.desktop
M kopete/protocols/yahoo/kopete_yahoo.desktop
M kpf/kpfapplet.desktop
M kpf/kpfpropertiesdialogplugin.desktop
M kppp/Kppp.desktop
M krdc/krdc.desktop
M krdc/smb2rdc.desktop
M krfb/kcm_krfb/kcmkrfb.desktop
M krfb/kinetd/kinetd.desktop
M krfb/krfb/kinetd_krfb.desktop
M krfb/krfb/krfb.desktop
M krfb/krfb_httpd/kinetd_krfb_httpd.desktop
M ksirc/ksirc.desktop
M ktalkd/kcmktalkd/kcmktalkd.desktop
M lanbrowsing/kcmlisa/kcmreslisa.desktop
M lanbrowsing/kcmlisa/kcmtdeiolan.desktop
M lanbrowsing/tdeio_lan/lan.desktop
M tdednssd/kdedmodule/dnssdwatcher.desktop
M tdefile-plugins/torrent/tdefile_torrent.desktop
M wifi/kcmwifi/kcmwifi.desktop
M wifi/kwifimanager.desktop
diff --git a/filesharing/advanced/kcm_sambaconf/kcmsambaconf.desktop b/filesharing/advanced/kcm_sambaconf/kcmsambaconf.desktop
index 89d40e0..cfee74c 100644
--- a/filesharing/advanced/kcm_sambaconf/kcmsambaconf.desktop
+++ b/filesharing/advanced/kcm_sambaconf/kcmsambaconf.desktop
@@ -2,7 +2,7 @@
 Exec=tdecmshell kcmsambaconf
 Icon=samba
 Type=Application
-DocPath=kcontrol/kcmsambaconf/index.html
+X-DocPath=kcontrol/kcmsambaconf/index.html
 Terminal=false
 X-TDE-FactoryName=KcmSambaConf
 X-TDE-Library=kcmsambaconf
diff --git a/filesharing/advanced/propsdlgplugin/fileshare_propsdlgplugin.desktop b/filesharing/advanced/propsdlgplugin/fileshare_propsdlgplugin.desktop
index ef58019..e06625b 100644
--- a/filesharing/advanced/propsdlgplugin/fileshare_propsdlgplugin.desktop
+++ b/filesharing/advanced/propsdlgplugin/fileshare_propsdlgplugin.desktop
@@ -99,4 +99,4 @@
 Comment[zh_TW]=Konqueror ���������������������������������������������������������������������
 X-TDE-Library=fileshare_propsdlgplugin
 X-TDE-Protocol=file
-ServiceTypes=KPropsDlg/Plugin,inode/directory
+X-TDE-ServiceTypes=KPropsDlg/Plugin,inode/directory
diff --git a/filesharing/simple/fileshare.desktop b/filesharing/simple/fileshare.desktop
index f425d07..d92cdf1 100644
--- a/filesharing/simple/fileshare.desktop
+++ b/filesharing/simple/fileshare.desktop
@@ -2,7 +2,7 @@
 Exec=tdecmshell fileshare
 Icon=share
 Type=Application
-DocPath=kcontrol/fileshare/index.html
+X-DocPath=kcontrol/fileshare/index.html
 X-TDE-ModuleType=Library
 X-TDE-Library=fileshare
 X-TDE-ParentApp=kcontrol
diff --git a/kdict/kdict.desktop b/kdict/kdict.desktop
index ffcd6df..2bd3f87 100644
--- a/kdict/kdict.desktop
+++ b/kdict/kdict.desktop
@@ -149,5 +149,5 @@
 GenericName[zu]=Isichaza magama esixhumekile
 X-TDE-StartupNotify=true
 X-DCOP-ServiceType=Unique
-DocPath=kdict/index.html
+X-DocPath=kdict/index.html
 Categories=Qt;TDE;Office;Dictionary;
diff --git a/kget/kget.desktop b/kget/kget.desktop
index 91225db..953304c 100644
--- a/kget/kget.desktop
+++ b/kget/kget.desktop
@@ -74,4 +74,4 @@
 GenericName[zh_TW]=���������������
 Categories=Qt;TDE;Network;FileTransfer;
 X-DCOP-ServiceType=Unique
-DocPath=kget/index.html
+X-DocPath=kget/index.html
diff --git a/kget/kget_download.desktop b/kget/kget_download.desktop
index 89654b8..bc7ebc8 100644
--- a/kget/kget_download.desktop
+++ b/kget/kget_download.desktop
@@ -1,8 +1,8 @@
 [Desktop Entry]
 Actions=KGetDownload;
 Icon=
-ServiceTypes=all/allfiles
-ExcludeServiceTypes=kdedevice/*
+X-TDE-ServiceTypes=all/allfiles
+X-TDE-ExcludeServiceTypes=kdedevice/*
 
 [Desktop Action KGetDownload]
 Exec=kget %U
diff --git a/knewsticker/knewsticker-standalone.desktop b/knewsticker/knewsticker-standalone.desktop
index 8586b9c..0c8e842 100644
--- a/knewsticker/knewsticker-standalone.desktop
+++ b/knewsticker/knewsticker-standalone.desktop
@@ -22,7 +22,7 @@
 Type=Application
 Exec=appletproxy knewsticker.desktop
 Icon=knewsticker
-DocPath=knewsticker/index.html
+X-DocPath=knewsticker/index.html
 GenericName=News Ticker
 GenericName[af]=Nuus Tikker
 GenericName[ar]=���������� ��������������
diff --git a/knewsticker/knewsticker.desktop b/knewsticker/knewsticker.desktop
index 16fff2f..42c9974 100644
--- a/knewsticker/knewsticker.desktop
+++ b/knewsticker/knewsticker.desktop
@@ -101,4 +101,4 @@
 Comment[zh_CN]=��������� RDF ���������������
 Comment[zh_HK]=��������� RDF ���������������
 Comment[zh_TW]=��������� RDF ������������
-DocPath=knewsticker/index.html
+X-DocPath=knewsticker/index.html
diff --git a/knewsticker/knewstickerstub/knewstickerstub.desktop b/knewsticker/knewstickerstub/knewstickerstub.desktop
index 2cd534b..0e47666 100644
--- a/knewsticker/knewstickerstub/knewstickerstub.desktop
+++ b/knewsticker/knewstickerstub/knewstickerstub.desktop
@@ -124,7 +124,7 @@
 NoDisplay=true
 Type=Application
 Terminal=false
-InitialPreference=8
+X-TDE-InitialPreference=8
 Actions=Add;
 X-TDE-StartupNotify=false
 
diff --git a/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.desktop b/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.desktop
index 1787df0..c625e77 100644
--- a/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.desktop
+++ b/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.desktop
@@ -66,4 +66,4 @@
 Name[zh_TW]=KNewsticker ���������������������
 Name[zu]=Umlekeleli wezindaba ze K wephepha lefayela Yemvelaphi Yempahla
 X-TDE-Library=libkntsrcfilepropsdlg
-ServiceTypes=KPropsDlg/Plugin,text/rdf,text/rss
+X-TDE-ServiceTypes=KPropsDlg/Plugin,text/rdf,text/rss
diff --git a/kopete/kopete/chatwindow/chatwindow.desktop b/kopete/kopete/chatwindow/chatwindow.desktop
index dfbfe3a..875ae52 100644
--- a/kopete/kopete/chatwindow/chatwindow.desktop
+++ b/kopete/kopete/chatwindow/chatwindow.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Service
-ServiceTypes=Kopete/Plugin
+X-TDE-ServiceTypes=Kopete/Plugin
 X-Kopete-Version=1000900
 X-TDE-Library=kopete_chatwindow
 X-TDE-PluginInfo-Author=Kopete Developers
diff --git a/kopete/kopete/chatwindow/emailwindow.desktop b/kopete/kopete/chatwindow/emailwindow.desktop
index 037ea0b..0c47c98 100644
--- a/kopete/kopete/chatwindow/emailwindow.desktop
+++ b/kopete/kopete/chatwindow/emailwindow.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Service
-ServiceTypes=Kopete/Plugin
+X-TDE-ServiceTypes=Kopete/Plugin
 X-Kopete-Version=1000900
 X-TDE-Library=kopete_emailwindow
 X-TDE-PluginInfo-Author=Kopete Developers
diff --git a/kopete/kopete/config/accounts/kopete_accountconfig.desktop b/kopete/kopete/config/accounts/kopete_accountconfig.desktop
index f7645dc..ea2e797 100644
--- a/kopete/kopete/config/accounts/kopete_accountconfig.desktop
+++ b/kopete/kopete/config/accounts/kopete_accountconfig.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=personal
 Type=Service
-ServiceTypes=TDECModule
+X-TDE-ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=kopete_accountconfig
@@ -126,6 +126,6 @@
 Comment[zh_CN]=������������������������������������
 Comment[zh_HK]=������������������������������
 Comment[zh_TW]=���������������������������������������
-DocPath=kopete/configure-dialog.html#configuring-accounts
+X-DocPath=kopete/configure-dialog.html#configuring-accounts
 
 
diff --git a/kopete/kopete/config/appearance/kopete_appearanceconfig.desktop b/kopete/kopete/config/appearance/kopete_appearanceconfig.desktop
index e5afd8f..aa923fc 100644
--- a/kopete/kopete/config/appearance/kopete_appearanceconfig.desktop
+++ b/kopete/kopete/config/appearance/kopete_appearanceconfig.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=looknfeel
 Type=Service
-ServiceTypes=TDECModule
+X-TDE-ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=kopete_appearanceconfig
@@ -125,6 +125,6 @@
 Comment[zh_CN]=������������������ Kopete ���������
 Comment[zh_HK]=������������������ Kopete ���������
 Comment[zh_TW]=��������������������� Kopete ������������������
-DocPath=kopete/configure-dialog.html#configuring-appearance
+X-DocPath=kopete/configure-dialog.html#configuring-appearance
 
 
diff --git a/kopete/kopete/config/avdevice/kopete_avdeviceconfig.desktop b/kopete/kopete/config/avdevice/kopete_avdeviceconfig.desktop
index 55bd8c3..ac69e82 100644
--- a/kopete/kopete/config/avdevice/kopete_avdeviceconfig.desktop
+++ b/kopete/kopete/config/avdevice/kopete_avdeviceconfig.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=kopete_avdevice
 Type=Service
-ServiceTypes=TDECModule
+X-TDE-ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=kopete_avdeviceconfig
@@ -115,4 +115,4 @@
 Comment[zh_CN]=������������������ Kopete ���������������������
 Comment[zh_HK]=������������������ Kopete ������������������������������
 Comment[zh_TW]=��������������������� Kopete ������������������������������
-DocPath=kopete/configure-dialog.html#configuring-avdevice
+X-DocPath=kopete/configure-dialog.html#configuring-avdevice
diff --git a/kopete/kopete/config/behavior/kopete_behaviorconfig.desktop b/kopete/kopete/config/behavior/kopete_behaviorconfig.desktop
index e02c4c8..4ef6d33 100644
--- a/kopete/kopete/config/behavior/kopete_behaviorconfig.desktop
+++ b/kopete/kopete/config/behavior/kopete_behaviorconfig.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=configure
 Type=Service
-ServiceTypes=TDECModule
+X-TDE-ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=kopete_behaviorconfig
@@ -129,7 +129,7 @@
 Comment[zh_CN]=��������������������� Kopete
 Comment[zh_HK]=������������������ Kopete ������������������
 Comment[zh_TW]=������������������ Kopete ���������
-DocPath=kopete/configure-dialog.html#configuring-behavior
+X-DocPath=kopete/configure-dialog.html#configuring-behavior
 
 
 
diff --git a/kopete/kopete/config/identity/kopete_identityconfig.desktop b/kopete/kopete/config/identity/kopete_identityconfig.desktop
index 8ab9dc9..cb46d0d 100644
--- a/kopete/kopete/config/identity/kopete_identityconfig.desktop
+++ b/kopete/kopete/config/identity/kopete_identityconfig.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=identity
 Type=Service
-ServiceTypes=TDECModule
+X-TDE-ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=kopete_identityconfig
@@ -109,4 +109,4 @@
 Comment[zh_HK]=������������������ Kopete ���������������������
 Comment[zh_TW]=���������������������������������������
 
-DocPath=kopete/configure-dialog.html#configuring-identity
+X-DocPath=kopete/configure-dialog.html#configuring-identity
diff --git a/kopete/kopete/kopete.desktop b/kopete/kopete/kopete.desktop
index 169b910..85b682c 100644
--- a/kopete/kopete/kopete.desktop
+++ b/kopete/kopete/kopete.desktop
@@ -117,10 +117,10 @@
 Comment[zh_TW]=���������������������������
 ** Diff limit reached (max: 250 lines) **