From 8dfd7abed8d60b888e99928e995a146342ae03f0 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Mon, 27 Jun 2011 22:26:25 +0200 Subject: rekonq 0.7.55, KDE SC 4.7 based (the KDELIBS version is 4.6.90, to say the truth..) remove KDE_IS_VERSION checks based on previous versions fix hold slaves handling --- src/webpage.cpp | 23 +++-------------------- 1 file changed, 3 insertions(+), 20 deletions(-) (limited to 'src/webpage.cpp') diff --git a/src/webpage.cpp b/src/webpage.cpp index 29ee4a40..adc1577a 100644 --- a/src/webpage.cpp +++ b/src/webpage.cpp @@ -393,13 +393,10 @@ void WebPage::handleUnsupportedContent(QNetworkReply *reply) { Q_ASSERT(reply); - // Put the job on hold... -#if KDE_IS_VERSION( 4, 5, 96) - kDebug() << "PUT REPLY ON HOLD..."; + if (!reply) + return; + KIO::Integration::AccessManager::putReplyOnHold(reply); -#else - reply->abort(); -#endif // This is probably needed just in ONE stupid case.. if (_protHandler.postHandling(reply->request(), mainFrame())) @@ -510,23 +507,9 @@ void WebPage::handleUnsupportedContent(QNetworkReply *reply) // No parts, just app services. Load it! // If the app is a KDE one, publish the slave on hold to let it use it. // Otherwise, run the app and remove it (the io slave...) - if (appService->categories().contains(QL1S("KDE"), Qt::CaseInsensitive)) - { -#if KDE_IS_VERSION( 4, 5, 96) - KIO::Scheduler::publishSlaveOnHold(); -#endif - KRun::run(*appService, replyUrl, 0, false, _suggestedFileName); - return; - } KRun::run(*appService, replyUrl, 0, false, _suggestedFileName); } - // Remove any ioslave that was put on hold... -#if KDE_IS_VERSION( 4, 5, 96) - kDebug() << "REMOVE SLAVES ON HOLD..."; - KIO::Scheduler::removeSlaveOnHold(); -#endif - return; } -- cgit v1.2.1