From 424cca0946eddc3f420031320e928e6531bd2dfd Mon Sep 17 00:00:00 2001
From: Thomas McGuire <mcguire@kde.org>
Date: Thu, 13 Nov 2008 23:12:33 +0000
Subject: [PATCH] Merged revisions 880534 via svnmerge from
 svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.1/kdepim

........
  r880534 | woebbe | 2008-11-05 20:38:00 +0100 (Wed, 05 Nov 2008) | 1 line

  call KMimeType::mimeType() with ResolveAliases so that e.g. application/x-zip (used by KDE3) works
........

svn path=/branches/kdepim/enterprise4/kdepim/; revision=884009
---
 kmcommands.cpp       | 2 +-
 kmmimeparttree.cpp   | 2 +-
 kmmsgpart.cpp        | 2 +-
 kmmsgpartdlg.cpp     | 2 +-
 kmreaderwin.cpp      | 2 +-
 objecttreeparser.cpp | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/kmcommands.cpp b/kmcommands.cpp
index 346518eb9..f900a3e0a 100644
--- a/kmcommands.cpp
+++ b/kmcommands.cpp
@@ -2977,7 +2977,7 @@ KService::Ptr KMHandleAttachmentCommand::getServiceOffer()
   // determine the MIME type of the attachment
   KMimeType::Ptr mimetype;
   // prefer the value of the Content-Type header
-  mimetype = KMimeType::mimeType( contentTypeStr );
+  mimetype = KMimeType::mimeType( contentTypeStr, KMimeType::ResolveAliases );
   if ( mimetype.isNull() ) {
     // consider the filename if mimetype can not be found by content-type
     mimetype = KMimeType::findByPath( mAtmName, 0, true /* no disk access */ );
diff --git a/kmmimeparttree.cpp b/kmmimeparttree.cpp
index bb318038c..929033007 100644
--- a/kmmimeparttree.cpp
+++ b/kmmimeparttree.cpp
@@ -442,7 +442,7 @@ void KMMimePartTreeItem::setIconAndTextForType( const QString & mime )
     setText( columnType, i18n("Unspecified Binary Data") ); // do not show "Unknown"...
     setIcon( columnDescription, QIcon( SmallIcon("application-octet-stream") ) );
   } else {
-    KMimeType::Ptr mtp = KMimeType::mimeType( mimetype );
+    KMimeType::Ptr mtp = KMimeType::mimeType( mimetype, KMimeType::ResolveAliases );
     setText( columnType, ( mtp && !mtp->comment().isEmpty() ) ? mtp->comment() : mimetype );
     setIcon( columnDescription, QIcon( mtp ? KIconLoader::global()->loadMimeTypeIcon(mtp->iconName(), KIconLoader::Small) : SmallIcon("unknown") ) );
   }
diff --git a/kmmsgpart.cpp b/kmmsgpart.cpp
index 76c888d31..e9431a5cf 100644
--- a/kmmsgpart.cpp
+++ b/kmmsgpart.cpp
@@ -315,7 +315,7 @@ QString KMMessagePart::iconName( int size ) const
   kAsciiToLower( mimeType.data() );
 
   QString fileName;
-  KMimeType::Ptr mime = KMimeType::mimeType( mimeType );
+  KMimeType::Ptr mime = KMimeType::mimeType( mimeType, KMimeType::ResolveAliases );
   if (mime) {
     fileName = mime->iconName();
   } else {
diff --git a/kmmsgpartdlg.cpp b/kmmsgpartdlg.cpp
index 961fc84a0..272059dd0 100644
--- a/kmmsgpartdlg.cpp
+++ b/kmmsgpartdlg.cpp
@@ -329,7 +329,7 @@ void KMMsgPartDialog::slotMimeTypeChanged( const QString & mimeType ) {
   }
 #endif
   // find a mimetype icon:
-  KMimeType::Ptr mt = KMimeType::mimeType( mimeType );
+  KMimeType::Ptr mt = KMimeType::mimeType( mimeType, KMimeType::ResolveAliases );
   if ( !mt.isNull() )
     mIcon->setPixmap( KIconLoader::global()->loadMimeTypeIcon( mt->iconName(),
                       KIconLoader::Desktop ) );
diff --git a/kmreaderwin.cpp b/kmreaderwin.cpp
index ec3be2725..5747c5d0e 100644
--- a/kmreaderwin.cpp
+++ b/kmreaderwin.cpp
@@ -2307,7 +2307,7 @@ void KMReaderWin::openAttachment( int id, const QString & name )
   // determine the MIME type of the attachment
   KMimeType::Ptr mimetype;
   // prefer the value of the Content-Type header
-  mimetype = KMimeType::mimeType( QString::fromLatin1( contentTypeStr ) );
+  mimetype = KMimeType::mimeType( QString::fromLatin1( contentTypeStr ), KMimeType::ResolveAliases );
   if ( mimetype.isNull() ) {
     // consider the filename if mimetype can not be found by content-type
     mimetype = KMimeType::findByPath( name, 0, true /* no disk access */ );
diff --git a/objecttreeparser.cpp b/objecttreeparser.cpp
index c6221ec61..9a7216fe5 100644
--- a/objecttreeparser.cpp
+++ b/objecttreeparser.cpp
@@ -1813,7 +1813,7 @@ bool ObjectTreeParser::processApplicationMsTnefSubtype( partNode *node, ProcessR
     mReader->mTempFiles.append( dir + QDir::separator() + att->name() );
     QString href = "file:" + KUrl::toPercentEncoding( dir + QDir::separator() + att->name() );
 
-    KMimeType::Ptr mimeType = KMimeType::mimeType( att->mimeTag() );
+    KMimeType::Ptr mimeType = KMimeType::mimeType( att->mimeTag(), KMimeType::ResolveAliases );
     QString iconName = KIconLoader::global()->iconPath( mimeType->iconName(), KIconLoader::Desktop );
 
     htmlWriter()->queue( "<div><a href=\"" + href + "\"><img src=\"" +