From 8bd51635d7c39bee8703a5f83bceee117f0f00c8 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Wed, 22 Oct 2014 01:27:30 -0500
Subject: 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

---
 kmail/kmail_config_misc.desktop | 2 +-
 kmail/kmheaders.cpp             | 2 +-
 kmail/kmmimeparttree.cpp        | 4 ++--
 kmail/kmmsgpartdlg.cpp          | 4 ++--
 kmail/searchwindow.cpp          | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'kmail')

diff --git a/kmail/kmail_config_misc.desktop b/kmail/kmail_config_misc.desktop
index 061d4ed5..a7aea4e5 100644
--- a/kmail/kmail_config_misc.desktop
+++ b/kmail/kmail_config_misc.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Icon=misc
+Icon=application-vnd.tde.misc
 Type=Service
 X-TDE-ServiceTypes=TDECModule
 
diff --git a/kmail/kmheaders.cpp b/kmail/kmheaders.cpp
index 77af8e44..3196e627 100644
--- a/kmail/kmheaders.cpp
+++ b/kmail/kmheaders.cpp
@@ -2401,7 +2401,7 @@ void KMHeaders::contentsMouseMoveEvent( TQMouseEvent* e )
       if( count == 1 )
         pixmap = TQPixmap( DesktopIcon("message", TDEIcon::SizeSmall) );
       else
-        pixmap = TQPixmap( DesktopIcon("tdemultiple", TDEIcon::SizeSmall) );
+        pixmap = TQPixmap( DesktopIcon("application-vnd.tde.tdemultiple", TDEIcon::SizeSmall) );
 
       // Calculate hotspot (as in Konqueror)
       if( !pixmap.isNull() ) {
diff --git a/kmail/kmmimeparttree.cpp b/kmail/kmmimeparttree.cpp
index 200e7736..4448cec4 100644
--- a/kmail/kmmimeparttree.cpp
+++ b/kmail/kmmimeparttree.cpp
@@ -366,11 +366,11 @@ void KMMimePartTreeItem::setIconAndTextForType( const TQString & mime )
     setPixmap( 0, SmallIcon("folder") );
   } else if ( mimetype == "application/octet-stream" ) {
     setText( 1, i18n("Unspecified Binary Data") ); // don't show "Unknown"...
-    setPixmap( 0, SmallIcon("unknown") );
+    setPixmap( 0, SmallIcon("text-x-katefilelist") );
   } else {
     KMimeType::Ptr mtp = KMimeType::mimeType( mimetype );
     setText( 1, (mtp && !mtp->comment().isEmpty()) ? mtp->comment() : mimetype );
-    setPixmap( 0, mtp ? mtp->pixmap( TDEIcon::Small) : SmallIcon("unknown") );
+    setPixmap( 0, mtp ? mtp->pixmap( TDEIcon::Small) : SmallIcon("text-x-katefilelist") );
   }
 }
 
diff --git a/kmail/kmmsgpartdlg.cpp b/kmail/kmmsgpartdlg.cpp
index 869ee015..2a0bd8cb 100644
--- a/kmail/kmmsgpartdlg.cpp
+++ b/kmail/kmmsgpartdlg.cpp
@@ -65,7 +65,7 @@ KMMsgPartDialog::KMMsgPartDialog( const TQString & caption,
 
   // mimetype icon:
   mIcon = new TQLabel( plainPage() );
-  mIcon->setPixmap( DesktopIcon("unknown") );
+  mIcon->setPixmap( DesktopIcon("text-x-katefilelist") );
   glay->addMultiCellWidget( mIcon, 0, 1, 0, 0 );
 
   // row 0: Type combobox:
@@ -325,7 +325,7 @@ void KMMsgPartDialog::slotMimeTypeChanged( const TQString & mimeType ) {
        == TQValidator::Acceptable )
     mIcon->setPixmap( KMimeType::mimeType( mimeType )->pixmap( TDEIcon::Desktop ) );
   else
-    mIcon->setPixmap( DesktopIcon("unknown") );
+    mIcon->setPixmap( DesktopIcon("text-x-katefilelist") );
 }
 
 
diff --git a/kmail/searchwindow.cpp b/kmail/searchwindow.cpp
index d1f370ac..bc97de04 100644
--- a/kmail/searchwindow.cpp
+++ b/kmail/searchwindow.cpp
@@ -95,7 +95,7 @@ class MatchListView : public TDEListView
       if( mailList.count() == 1 )
         pixmap = TQPixmap( DesktopIcon("message", TDEIcon::SizeSmall) );
       else
-        pixmap = TQPixmap( DesktopIcon("tdemultiple", TDEIcon::SizeSmall) );
+        pixmap = TQPixmap( DesktopIcon("application-vnd.tde.tdemultiple", TDEIcon::SizeSmall) );
 
       d->setPixmap( pixmap );
       return d;
-- 
cgit v1.2.3