Commit 73283f13 authored by David Faure's avatar David Faure

Revert "Also check parent mimetypes in protocolForArchiveMimetype()."

This reverts commit 4f296cfb.
It breaks opening odt and other zip-based files in external apps.
That's what I get for delegating the testing :-)
BUG: 311214
parent c312fdee
......@@ -47,7 +47,6 @@
#include <ksharedconfig.h>
#include <kstandarddirs.h>
#include <kurl.h>
#include <kmimetype.h>
#include <kmimetypetrader.h>
#include <kprotocolinfofactory.h>
......@@ -1190,23 +1189,7 @@ QString KProtocolManager::protocolForArchiveMimetype( const QString& 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();
return d->protocolForArchiveMimetypes.value(mimeType);
}
#undef PRIVATE_DATA
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment