[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/apps/konqueror/src
From:       David Faure <faure () kde ! org>
Date:       2008-06-04 16:29:17
Message-ID: 1212596957.964948.16020.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 816706 by dfaure:

Resolve mimetype aliases. I think I should have made this default in \
KMimeType::mimeType, but it's too late to change that now...


 M  +1 -1      konqrun.cpp  
 M  +9 -1      konqsettings.cpp  


--- trunk/KDE/kdebase/apps/konqueror/src/konqrun.cpp #816705:816706
@@ -93,7 +93,7 @@
     const bool associatedAppIsKonqueror = \
KonqMainWindow::isMimeTypeAssociatedWithSelf(mimeType);  
     if (tryEmbed) {
-        KMimeType::Ptr mime = KMimeType::mimeType(mimeType);
+        KMimeType::Ptr mime = KMimeType::mimeType(mimeType, \
KMimeType::ResolveAliases);  if (associatedAppIsKonqueror)
             m_req.forceAutoEmbed = true;
         else if (mime && mime->is("text/html") && \
                m_pMainWindow->hasViewWithMimeType(mimeType)) {
--- trunk/KDE/kdebase/apps/konqueror/src/konqsettings.cpp #816705:816706
@@ -78,8 +78,15 @@
     return false;
 }
 
-bool KonqFMSettings::shouldEmbed( const QString & mimeType ) const
+bool KonqFMSettings::shouldEmbed(const QString & _mimeType) const
 {
+    KMimeType::Ptr mime = KMimeType::mimeType(_mimeType, KMimeType::ResolveAliases);
+    if (!mime) {
+        kWarning() << "Unknown mimetype" << _mimeType;
+        return false; // unknown mimetype!
+    }
+    const QString mimeType = mime->name();
+
     // First check in user's settings whether to embed or not
     // 1 - in the filetypesrc config file (written by the configuration module)
     QMap<QString, QString>::const_iterator it = m_embedMap.find( \
QString::fromLatin1("embed-")+mimeType ); @@ -106,6 +113,7 @@
                 return true;
             }
             KMimeType::Ptr mime = KMimeType::mimeType(parent);
+            Q_ASSERT(mime); // how could the -parent- be null?
             if (mime)
                 parents += mime->parentMimeTypes();
         }


[prev in list] [next in list] [prev in thread] [next in thread]