Branch: master

b59dcae5 2014-10-22 01:27:23 Timothy Pearson
Bring most mimetypes in line with XDG specifications.  The following are not fully verified in source as of this commit due to ubiquity: html, empty, info, make, man, misc, source, unknown
M src/dolphiniconsview.cpp
M src/servicemenus/imageconverter.desktop
M src/servicemenus/installfont.desktop
M src/servicemenus/jpegorient.desktop
diff --git a/src/dolphiniconsview.cpp b/src/dolphiniconsview.cpp
index 9a6e248..6ad371a 100644
--- a/src/dolphiniconsview.cpp
+++ b/src/dolphiniconsview.cpp
@@ -309,7 +309,7 @@
 
     TQPixmap pixmap;
     if(urls.count() > 1) {
-        pixmap = DesktopIcon("tdemultiple", iconSize());
+        pixmap = DesktopIcon("application-vnd.tde.tdemultiple", iconSize());
     }
     else {
         KFileIconViewItem* item = static_cast<KFileIconViewItem*>(currentItem());
diff --git a/src/servicemenus/imageconverter.desktop b/src/servicemenus/imageconverter.desktop
index e5c9b36..6a04951 100644
--- a/src/servicemenus/imageconverter.desktop
+++ b/src/servicemenus/imageconverter.desktop
@@ -35,27 +35,27 @@
 Name=JPEG
 Name[hi]=���������������������
 Name[xx]=xxJPEGxx
-Icon=image
+Icon=image-x-generic
 Exec=convert %f "`echo %f | perl -pe 's/\.[^.]+$//'`.jpg"
 
 [Desktop Action convToPNG]
 Name=PNG
 Name[hi]=������������������
 Name[xx]=xxPNGxx
-Icon=image
+Icon=image-x-generic
 Exec=convert %f "`echo %f | perl -pe 's/\.[^.]+$//'`.png"
 
 [Desktop Action convToTIF]
 Name=TIF
 Name[hi]=������������
 Name[xx]=xxTIFxx
-Icon=image
+Icon=image-x-generic
 Exec=convert %f "`echo %f | perl -pe 's/\.[^.]+$//'`.tif"
 
 [Desktop Action convToGIF]
 Name=GIF
 Name[hi]=������������
 Name[xx]=xxGIFxx
-Icon=image
+Icon=image-x-generic
 Exec=convert %f "`echo %f | perl -pe 's/\.[^.]+$//'`.gif"
 
diff --git a/src/servicemenus/installfont.desktop b/src/servicemenus/installfont.desktop
index bac2509..62a7dba 100644
--- a/src/servicemenus/installfont.desktop
+++ b/src/servicemenus/installfont.desktop
@@ -138,6 +138,6 @@
 #SUSE-Overwrite Name[vi]=C��i �����t
 Name[zh_CN]=������
 Name[zh_TW]=������
-Icon=fonts
+Icon=font-x-generics
 Exec=kfmclient copy %U fonts:/
 
diff --git a/src/servicemenus/jpegorient.desktop b/src/servicemenus/jpegorient.desktop
index 6cd2efc..d3dd047 100644
--- a/src/servicemenus/jpegorient.desktop
+++ b/src/servicemenus/jpegorient.desktop
@@ -124,7 +124,7 @@
 
 #[Desktop Action jpegRot180]
 #Name=Rotate 180
-#Icon=misc
+#Icon=application-vnd.tde.misc
 #Exec=jpegorient +180 %F
 
 [Desktop Action jpegFlipV]