[packages/kde4-kdelibs] - up to 4.9.5

[arekm]

commit 90e26d1d0c2b12b797ce20d3fa3781a056e1731d
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Sat Jan 5 01:08:22 2013 +0100

    - up to 4.9.5

 ...hen-no-service-was-selected-user-clicked-.patch | 26 -----------
 ...-check-parent-mimetypes-in-protocolForArc.patch | 54 ----------------------
 2 files changed, 80 deletions(-)
---
diff --git a/0001-Fix-crash-when-no-service-was-selected-user-clicked-.patch b/0001-Fix-crash-when-no-service-was-selected-user-clicked-.patch
deleted file mode 100644
index 6626b23..0000000
--- a/0001-Fix-crash-when-no-service-was-selected-user-clicked-.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 0820b3173aff4f0f3c803a9e75e726024da38ee5 Mon Sep 17 00:00:00 2001
-From: David Faure <faure at kde.org>
-Date: Thu, 6 Dec 2012 11:55:05 +0100
-Subject: [PATCH] Fix crash when no service was selected (user clicked on
- "Open With...")
-
----
- kparts/browserrun.cpp |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/kparts/browserrun.cpp b/kparts/browserrun.cpp
-index 6d84800..6de0380 100644
---- a/kparts/browserrun.cpp
-+++ b/kparts/browserrun.cpp
-@@ -304,7 +304,7 @@ BrowserRun::NonEmbeddableResult BrowserRun::handleNonEmbeddable(const QString& _
-                          this, SLOT(slotCopyToTempFileResult(KJob*)) );
-                 return Delayed; // We'll continue after the job has finished
-             }
--            if (selectedService) {
-+            if (selectedService && question.selectedService()) {
-                 *selectedService = question.selectedService();
-                 // KRun will use this when starting an app
-                 KRun::setPreferredService(question.selectedService()->desktopEntryName());
--- 
-1.7.7
-
diff --git a/0001-Revert-Also-check-parent-mimetypes-in-protocolForArc.patch b/0001-Revert-Also-check-parent-mimetypes-in-protocolForArc.patch
deleted file mode 100644
index bdbf7c5..0000000
--- a/0001-Revert-Also-check-parent-mimetypes-in-protocolForArc.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 73283f1332e90fbb6fe0caa39a038cb16b83a54c Mon Sep 17 00:00:00 2001
-From: David Faure <faure at 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
-
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/kde4-kdelibs.git/commitdiff/90e26d1d0c2b12b797ce20d3fa3781a056e1731d