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

10 files changed, 16 insertions, 16 deletions

diff --git a/src/desktopfiles/gwenview.desktop b/src/desktopfiles/gwenview.desktop
index 315ba27..bfad3a0 100644
--- a/src/desktopfiles/gwenview.desktop
+++ b/src/desktopfiles/gwenview.desktop
@@ -104,4 +104,4 @@ Icon=gwenview
 Type=Application
 Categories=Qt;TDE;Graphics;
 MimeType=image/gif;image/x-xpm;image/x-xbm;image/jpeg;image/x-pcx;image/x-bmp;image/png;image/x-ico;image/x-portable-bitmap;image/x-portable-pixmap;image/x-portable-greymap;image/tiff;image/x-targa;image/svg+xml;
-DocPath=gwenview/index.html
+X-DocPath=gwenview/index.html
diff --git a/src/desktopfiles/konqgwenview.desktop b/src/desktopfiles/konqgwenview.desktop
index cf6f2d8..a026b2d 100644
--- a/src/desktopfiles/konqgwenview.desktop
+++ b/src/desktopfiles/konqgwenview.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Encoding=UTF-8
-ServiceTypes=inode/directory
+X-TDE-ServiceTypes=inode/directory
 Actions=gwenview;
 
 [Desktop Action gwenview]
diff --git a/src/gvcore/externaltooldialog.cpp b/src/gvcore/externaltooldialog.cpp
index 47ca826..35b4bc9 100644
--- a/src/gvcore/externaltooldialog.cpp
+++ b/src/gvcore/externaltooldialog.cpp
@@ -105,17 +105,17 @@ struct ExternalToolDialogPrivate {
 	void writeServiceTypes(KDesktopFile* desktopFile) {
 		TQButton* button=mContent->mFileAssociationGroup->selected();
 		if (!button) {
-			desktopFile->writeEntry("ServiceTypes", "*");
+			desktopFile->writeEntry("X-TDE-ServiceTypes", "*");
 			return;
 		}
 
 		int id=mContent->mFileAssociationGroup->id(button);
 		if (id==ID_ALL_IMAGES) {
-			desktopFile->writeEntry("ServiceTypes", "image/*");
+			desktopFile->writeEntry("X-TDE-ServiceTypes", "image/*");
 			return;
 		}
 		if (id==ID_ALL_FILES) {
-			desktopFile->writeEntry("ServiceTypes", "*");
+			desktopFile->writeEntry("X-TDE-ServiceTypes", "*");
 			return;
 		}
 
@@ -126,7 +126,7 @@ struct ExternalToolDialogPrivate {
 				mimeTypes.append(item->text(0));
 			}
 		}
-		desktopFile->writeEntry("ServiceTypes", mimeTypes);
+		desktopFile->writeEntry("X-TDE-ServiceTypes", mimeTypes);
 	}
 	
 
@@ -213,7 +213,7 @@ struct ExternalToolDialogPrivate {
 				mContent->mName->setText(desktopFile->readName());
 				mContent->mCommand->setURL(desktopFile->readEntry("Exec"));
 				mContent->mIconButton->setIcon(desktopFile->readIcon());
-				TQStringList serviceTypes=desktopFile->readListEntry("ServiceTypes");
+				TQStringList serviceTypes=desktopFile->readListEntry("X-TDE-ServiceTypes");
 				updateFileAssociationGroup(serviceTypes);
 				return;
 			}
diff --git a/src/gvdirpart/gvdirpart.desktop b/src/gvdirpart/gvdirpart.desktop
index 8b437ba..710ec21 100644
--- a/src/gvdirpart/gvdirpart.desktop
+++ b/src/gvdirpart/gvdirpart.desktop
@@ -38,7 +38,7 @@ Name[vi]=Xem ảnh
 Name[xx]=xxImage Viewxx
 Name[zh_CN]=图像查看
 MimeType=inode/directory
-ServiceTypes=KParts/ReadOnlyPart
+X-TDE-ServiceTypes=KParts/ReadOnlyPart
 X-TDE-Library=libgvdirpart
-InitialPreference=5
+X-TDE-InitialPreference=5
 Icon=gvdirpart
diff --git a/src/gvimagepart/gvimagepart.desktop b/src/gvimagepart/gvimagepart.desktop
index 484987f..8392534 100644
--- a/src/gvimagepart/gvimagepart.desktop
+++ b/src/gvimagepart/gvimagepart.desktop
@@ -42,7 +42,7 @@ Name[vi]=Bộ xem ảnh Gwenview
 Name[xx]=xxGwenview Image Viewerxx
 Name[zh_CN]=Gwenview 图像查看器
 MimeType=image/gif;image/jpeg;image/png;image/x-bmp;image/x-eps;image/x-ico;image/x-krl;image/x-portable-bitmap;image/x-portable-pixmap;image/x-xbm;image/x-xpm
-ServiceTypes=KParts/ReadOnlyPart
+X-TDE-ServiceTypes=KParts/ReadOnlyPart
 X-TDE-Library=libgvimagepart
-InitialPreference=5
+X-TDE-InitialPreference=5
 Icon=gwenview
diff --git a/src/tools/gimp.desktop b/src/tools/gimp.desktop
index 8882956..8438fd8 100644
--- a/src/tools/gimp.desktop
+++ b/src/tools/gimp.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-ServiceTypes=image/*
+X-TDE-ServiceTypes=image/*
 Exec=gimp-remote %F
 Icon=gimp
 Name=The GIMP
diff --git a/src/tools/kolourpaint.desktop b/src/tools/kolourpaint.desktop
index 2cce8ee..b65c326 100644
--- a/src/tools/kolourpaint.desktop
+++ b/src/tools/kolourpaint.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-ServiceTypes=image/*
+X-TDE-ServiceTypes=image/*
 Name=KolourPaint
 Name[pa]=ਕੇ-ਰੰਗ-ਪੇਂਟ
 Name[xx]=xxKolourPaintxx
diff --git a/src/tools/konqueror.desktop b/src/tools/konqueror.desktop
index b307f9a..0573b8e 100644
--- a/src/tools/konqueror.desktop
+++ b/src/tools/konqueror.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-ServiceTypes=*
+X-TDE-ServiceTypes=*
 Exec=konqueror %u
 Icon=konqueror
 Name=Konqueror
diff --git a/src/tools/tiledwallpaper.desktop b/src/tools/tiledwallpaper.desktop
index 3c91c47..87343f2 100644
--- a/src/tools/tiledwallpaper.desktop
+++ b/src/tools/tiledwallpaper.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-ServiceTypes=image/*
+X-TDE-ServiceTypes=image/*
 Exec=dcop kdesktop KBackgroundIface setWallpaper %u 2
 Icon=background
 Name=Set as Tiled Wallpaper
diff --git a/src/tools/wallpaper.desktop b/src/tools/wallpaper.desktop
index 5287a5b..f67c8f5 100644
--- a/src/tools/wallpaper.desktop
+++ b/src/tools/wallpaper.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-ServiceTypes=image/*
+X-TDE-ServiceTypes=image/*
 Exec=dcop kdesktop KBackgroundIface setWallpaper %u 6
 Icon=background
 Name=Set as Wallpaper