From 9cd56aeb8f1b63c0a45cc399d2f7576be4b28048 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Sun, 9 Jan 2011 11:29:44 +0100 Subject: Should fix rekonq compilation against KDE SC 4.5... Please, let me know if not. --- src/webpage.cpp | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) (limited to 'src/webpage.cpp') diff --git a/src/webpage.cpp b/src/webpage.cpp index c7ddfd5b..63a7747c 100644 --- a/src/webpage.cpp +++ b/src/webpage.cpp @@ -383,9 +383,13 @@ void WebPage::handleUnsupportedContent(QNetworkReply *reply) Q_ASSERT (reply); // Put the job on hold... - kDebug() << "PUT REPLY ON HOLD..."; - KIO::Integration::AccessManager::putReplyOnHold(reply); - + #if KDE_IS_VERSION( 4, 5, 96) + kDebug() << "PUT REPLY ON HOLD..."; + KIO::Integration::AccessManager::putReplyOnHold(reply); + #elseif + reply->abort(); + #endif + // This is probably needed just in ONE stupid case.. if (_protHandler.postHandling(reply->request(), mainFrame())) return; @@ -504,7 +508,9 @@ void WebPage::handleUnsupportedContent(QNetworkReply *reply) // Otherwise, run the app and remove it (the io slave...) if (appService->categories().contains(QL1S("KDE"), Qt::CaseInsensitive)) { - KIO::Scheduler::publishSlaveOnHold(); + #if KDE_IS_VERSION( 4, 5, 96) + KIO::Scheduler::publishSlaveOnHold(); + #endif KRun::run(*appService, replyUrl, 0, false, _suggestedFileName); return; } @@ -512,9 +518,11 @@ void WebPage::handleUnsupportedContent(QNetworkReply *reply) } // Remove any ioslave that was put on hold... - kDebug() << "REMOVE SLAVES ON HOLD..."; - KIO::Scheduler::removeSlaveOnHold(); - + #if KDE_IS_VERSION( 4, 5, 96) + kDebug() << "REMOVE SLAVES ON HOLD..."; + KIO::Scheduler::removeSlaveOnHold(); + #endif + return; } -- cgit v1.2.1