Branch: master

33696d15 2014-10-11 17:19:17 Timothy Pearson 
Fix ServiceTypes, ExcludeServiceTypes, and DocPath desktop file entries to match XDG specifications
M k3bsetup/k3bsetup2.desktop
M src/k3b.desktop
M src/konqi/k3b_audiocd_rip.desktop
M src/konqi/k3b_cd_copy.desktop
M src/konqi/k3b_create_audio_cd.desktop
M src/konqi/k3b_create_data_cd.desktop
M src/konqi/k3b_create_data_dvd.desktop
M src/konqi/k3b_create_video_cd.desktop
M src/konqi/k3b_dvd_copy.desktop
M src/konqi/k3b_handle_empty_cd.desktop
M src/konqi/k3b_handle_empty_dvd.desktop
M src/konqi/k3b_videodvd_rip.desktop
M src/konqi/k3b_write_bin_image.desktop
M src/konqi/k3b_write_iso_image.desktop
M tdefile-plugins/k3bproject/tdefile_k3b.desktop
 
diff --git a/k3bsetup/k3bsetup2.desktop b/k3bsetup/k3bsetup2.desktop
index 43aaa23..90c0ea9 100644
--- a/k3bsetup/k3bsetup2.desktop
+++ b/k3bsetup/k3bsetup2.desktop
@@ -97,7 +97,7 @@
 X-TDE-ModuleType=Library
 X-TDE-RootOnly=true
 Categories=Application;System;X-TDE-System;
-DocPath=k3b/index.html#pre-setup
+X-DocPath=k3b/index.html#pre-setup
 GenericName=CD & DVD Burning Setup
 GenericName[af]=CD & DVD Skryf Opstelling
 GenericName[ar]=����������  ���������� ���������� ���������� ������������ (CD) �� ���������� ������������ ������������ (DVD)
diff --git a/src/k3b.desktop b/src/k3b.desktop
index 561d36e..0ed6121 100644
--- a/src/k3b.desktop
+++ b/src/k3b.desktop
@@ -2,7 +2,7 @@
 Type=Application
 Exec=k3b %U
 Icon=k3b
-DocPath=k3b/index.html
+X-DocPath=k3b/index.html
 GenericName=CD & DVD Burning
 GenericName[af]=CD & DVD Skrywer
 GenericName[ar]= ���������� ���������� ���������� ������������(CD)  �� ���������� ������������ ������������ (DVD)
diff --git a/src/konqi/k3b_audiocd_rip.desktop b/src/konqi/k3b_audiocd_rip.desktop
index 60e2747..a2b9df3 100644
--- a/src/konqi/k3b_audiocd_rip.desktop
+++ b/src/konqi/k3b_audiocd_rip.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-ServiceTypes=media/audiocd,media/mixedcd
+X-TDE-ServiceTypes=media/audiocd,media/mixedcd
 Actions=K3bRip;
 X-TDE-Priority=TopLevel
 
diff --git a/src/konqi/k3b_cd_copy.desktop b/src/konqi/k3b_cd_copy.desktop
index 76f3fa7..954e398 100644
--- a/src/konqi/k3b_cd_copy.desktop
+++ b/src/konqi/k3b_cd_copy.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-ServiceTypes=media/cdrom_unmounted,media/cdwriter_unmounted,media/audiocd
+X-TDE-ServiceTypes=media/cdrom_unmounted,media/cdwriter_unmounted,media/audiocd
 Actions=K3bCDCopy;
 X-TDE-Priority=TopLevel
 
diff --git a/src/konqi/k3b_create_audio_cd.desktop b/src/konqi/k3b_create_audio_cd.desktop
index e4ecad9..2f8205e 100644
--- a/src/konqi/k3b_create_audio_cd.desktop
+++ b/src/konqi/k3b_create_audio_cd.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Actions=CreateK3bAudioProject;
 Encoding=UTF-8
-ServiceTypes=audio/x-mp3,audio/x-vorbis,application/x-ogg,audio/x-mp2,audio/x-mpegurl,audio/x-wav
+X-TDE-ServiceTypes=audio/x-mp3,audio/x-vorbis,application/x-ogg,audio/x-mp2,audio/x-mpegurl,audio/x-wav
 
 [Desktop Action CreateK3bAudioProject]
 Exec=k3b --audiocd %F
diff --git a/src/konqi/k3b_create_data_cd.desktop b/src/konqi/k3b_create_data_cd.desktop
index af6bcaa..4bbe3f3 100644
--- a/src/konqi/k3b_create_data_cd.desktop
+++ b/src/konqi/k3b_create_data_cd.desktop
@@ -1,8 +1,8 @@
 [Desktop Entry]
 Actions=CreateK3bDataCDProject;
 Encoding=UTF-8
-ServiceTypes=all/allfiles,inode/directory
-ExcludeServiceTypes=application/x-iso,kdedevice/*
+X-TDE-ServiceTypes=all/allfiles,inode/directory
+X-TDE-ExcludeServiceTypes=application/x-iso,kdedevice/*
 
 [Desktop Action CreateK3bDataCDProject]
 Exec=k3b --datacd %F
diff --git a/src/konqi/k3b_create_data_dvd.desktop b/src/konqi/k3b_create_data_dvd.desktop
index d03e5b5..ebc65a7 100644
--- a/src/konqi/k3b_create_data_dvd.desktop
+++ b/src/konqi/k3b_create_data_dvd.desktop
@@ -1,8 +1,8 @@
 [Desktop Entry]
 Actions=CreateK3bDataDVDProject
 Encoding=UTF-8
-ServiceTypes=all/allfiles,inode/directory
-ExcludeServiceTypes=application/x-iso
+X-TDE-ServiceTypes=all/allfiles,inode/directory
+X-TDE-ExcludeServiceTypes=application/x-iso
 
 [Desktop Action CreateK3bDataDVDProject]
 Exec=k3b --datadvd %F
diff --git a/src/konqi/k3b_create_video_cd.desktop b/src/konqi/k3b_create_video_cd.desktop
index bb5ca3a..32f6cd5 100644
--- a/src/konqi/k3b_create_video_cd.desktop
+++ b/src/konqi/k3b_create_video_cd.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Actions=CreateK3bVcdProject;
 Encoding=UTF-8
-ServiceTypes=video/mpeg
+X-TDE-ServiceTypes=video/mpeg
 
 [Desktop Action CreateK3bVcdProject]
 Exec=k3b --videocd %F
diff --git a/src/konqi/k3b_dvd_copy.desktop b/src/konqi/k3b_dvd_copy.desktop
index 6f0c4e6..894dc60 100644
--- a/src/konqi/k3b_dvd_copy.desktop
+++ b/src/konqi/k3b_dvd_copy.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-ServiceTypes=media/dvdrom_unmounted,media/dvdwriter_unmounted,media/dvdvideo
+X-TDE-ServiceTypes=media/dvdrom_unmounted,media/dvdwriter_unmounted,media/dvdvideo
 Actions=K3bDVDCopy;
 X-TDE-Priority=TopLevel
 
diff --git a/src/konqi/k3b_handle_empty_cd.desktop b/src/konqi/k3b_handle_empty_cd.desktop
index aea61e4..70fdd43 100644
--- a/src/konqi/k3b_handle_empty_cd.desktop
+++ b/src/konqi/k3b_handle_empty_cd.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-ServiceTypes=media/blankcd
+X-TDE-ServiceTypes=media/blankcd
 Actions=K3bDataProject;K3bAudioCDProject;
 X-TDE-Priority=TopLevel
 
diff --git a/src/konqi/k3b_handle_empty_dvd.desktop b/src/konqi/k3b_handle_empty_dvd.desktop
index a992ce3..c5a48fa 100644
--- a/src/konqi/k3b_handle_empty_dvd.desktop
+++ b/src/konqi/k3b_handle_empty_dvd.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-ServiceTypes=media/blankdvd
+X-TDE-ServiceTypes=media/blankdvd
 Actions=K3bDataProject;
 X-TDE-Priority=TopLevel
 
diff --git a/src/konqi/k3b_videodvd_rip.desktop b/src/konqi/k3b_videodvd_rip.desktop
index e9ee128..28f7e73 100644
--- a/src/konqi/k3b_videodvd_rip.desktop
+++ b/src/konqi/k3b_videodvd_rip.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-ServiceTypes=media/dvdvideo
+X-TDE-ServiceTypes=media/dvdvideo
 Actions=K3bRip;
 X-TDE-Priority=TopLevel
 
diff --git a/src/konqi/k3b_write_bin_image.desktop b/src/konqi/k3b_write_bin_image.desktop
index 40a021c..2e24be8 100644
--- a/src/konqi/k3b_write_bin_image.desktop
+++ b/src/konqi/k3b_write_bin_image.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Actions=WriteCdImage;
 Encoding=UTF-8
-ServiceTypes=application/x-cue
+X-TDE-ServiceTypes=application/x-cue
 
 [Desktop Action WriteCdImage]
 Exec=k3b --cdimage %F
diff --git a/src/konqi/k3b_write_iso_image.desktop b/src/konqi/k3b_write_iso_image.desktop
index 4e3e91e..d118d2a 100644
--- a/src/konqi/k3b_write_iso_image.desktop
+++ b/src/konqi/k3b_write_iso_image.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Actions=WriteCdImage;
 Encoding=UTF-8
-ServiceTypes=application/x-iso,inode/ISO-image
+X-TDE-ServiceTypes=application/x-iso,inode/ISO-image
 
 [Desktop Action WriteCdImage]
 Exec=k3b --image %F
diff --git a/tdefile-plugins/k3bproject/tdefile_k3b.desktop b/tdefile-plugins/k3bproject/tdefile_k3b.desktop
index b93ae66..92e4614 100644
--- a/tdefile-plugins/k3bproject/tdefile_k3b.desktop
+++ b/tdefile-plugins/k3bproject/tdefile_k3b.desktop
@@ -46,7 +46,7 @@
 Name[uz@cyrillic]=K3b ���������������� ������������ ����������������
 Name[zh_CN]=K3b ������������
 Name[zh_TW]=K3b ������������
-ServiceTypes=KFilePlugin
+X-TDE-ServiceTypes=KFilePlugin
 X-TDE-Library=tdefile_k3b
 MimeType=application/x-k3b
 PreferredGroups=General