diff options
author | André Fabian Silva Delgado <emulatorman@lavabit.com> | 2013-03-07 22:19:15 -0200 |
---|---|---|
committer | André Fabian Silva Delgado <emulatorman@lavabit.com> | 2013-03-07 22:19:15 -0200 |
commit | e52ab87c68027ff2d610fef9c18a118adac5a2bd (patch) | |
tree | ebe863b5a59352a7b68ef665a6fc5333e32a8520 /libre/kdelibs-libre/0001-Revert-Also-check-parent-mimetypes-in-protocolForArc.patch | |
parent | 2377f1cfac3abf4d573db1a0cfd043738b833afe (diff) | |
download | abslibre-e52ab87c68027ff2d610fef9c18a118adac5a2bd.tar.gz abslibre-e52ab87c68027ff2d610fef9c18a118adac5a2bd.tar.bz2 abslibre-e52ab87c68027ff2d610fef9c18a118adac5a2bd.zip |
kdelibs-libre-4.10.1-2: reverting some things related to khtml freedom issue and removing obsolete files
Diffstat (limited to 'libre/kdelibs-libre/0001-Revert-Also-check-parent-mimetypes-in-protocolForArc.patch')
-rw-r--r-- | libre/kdelibs-libre/0001-Revert-Also-check-parent-mimetypes-in-protocolForArc.patch | 53 |
1 files changed, 0 insertions, 53 deletions
diff --git a/libre/kdelibs-libre/0001-Revert-Also-check-parent-mimetypes-in-protocolForArc.patch b/libre/kdelibs-libre/0001-Revert-Also-check-parent-mimetypes-in-protocolForArc.patch deleted file mode 100644 index 5aadeb883..000000000 --- a/libre/kdelibs-libre/0001-Revert-Also-check-parent-mimetypes-in-protocolForArc.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 73283f1332e90fbb6fe0caa39a038cb16b83a54c Mon Sep 17 00:00:00 2001 -From: David Faure <faure@kde.org> -Date: Wed, 5 Dec 2012 22:42:25 +0100 -Subject: [PATCH] Revert "Also check parent mimetypes in - protocolForArchiveMimetype()." - -This reverts commit 4f296cfbced2c4ad54beec8f500ed2d3fc04ee05. -It breaks opening odt and other zip-based files in external apps. -That's what I get for delegating the testing :-) -BUG: 311214 ---- - kio/kio/kprotocolmanager.cpp | 19 +------------------ - 1 files changed, 1 insertions(+), 18 deletions(-) - -diff --git a/kio/kio/kprotocolmanager.cpp b/kio/kio/kprotocolmanager.cpp -index 3f1cadd..502a3e6 100644 ---- a/kio/kio/kprotocolmanager.cpp -+++ b/kio/kio/kprotocolmanager.cpp -@@ -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 --- -1.7.7 |