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

List:       kde-commits
Subject:    [kdelibs/KDE/4.10] kio/kio: Merge remote-tracking branch 'origin/KDE/4.9' into KDE/4.10
From:       Albert Astals Cid <aacid () kde ! org>
Date:       2012-11-30 20:48:59
Message-ID: 20121130204859.4B82FA6091 () git ! kde ! org
[Download RAW message or body]

Git commit c208aaf615e3a6e8c839958315cf5da63db9ef60 by Albert Astals Cid.
Committed on 30/11/2012 at 21:48.
Pushed by aacid into branch 'KDE/4.10'.

Merge remote-tracking branch 'origin/KDE/4.9' into KDE/4.10

Conflicts:
	CMakeLists.txt
	README
	cmake/modules/KDE4Defaults.cmake

M  +18   -1    kio/kio/kprotocolmanager.cpp

http://commits.kde.org/kdelibs/c208aaf615e3a6e8c839958315cf5da63db9ef60

diff --cc kio/kio/kprotocolmanager.cpp
index 05bb547,3f1cadd..f8ed48a
--- a/kio/kio/kprotocolmanager.cpp
+++ b/kio/kio/kprotocolmanager.cpp
@@@ -1189,12 -1190,23 +1190,28 @@@ QString KProtocolManager::protocolForAr
              }
          }
      }
-     return d->protocolForArchiveMimetypes.value(mimeType);
+     const QString prot = d->protocolForArchiveMimetypes.value(mimeType);
+     if (!prot.isEmpty())
+         return prot;
+ 
+     // Check parent mimetypes
+     KMimeType::Ptr mime = KMimeType::mimeType(mimeType);
+     if (mime) {
+         const QStringList parentMimeTypes = mime->allParentMimeTypes();
+         Q_FOREACH(const QString& parentMimeType, parentMimeTypes) {
+             const QString res = d->protocolForArchiveMimetypes.value(parentMimeType);
+             if (!res.isEmpty()) {
+                 return res;
+             }
+         }
+     }
+ 
+     return QString();
  }
  
 +QString KProtocolManager::charsetFor(const KUrl& url)
 +{
 +    return KIO::SlaveConfig::self()->configData(url.scheme(), url.host(), QLatin1String("Charset"));
 +}
 +
  #undef PRIVATE_DATA
[prev in list] [next in list] [prev in thread] [next in thread]