diff options
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/networkaccessmanager.cpp | 48 | ||||
| -rw-r--r-- | src/webpage.cpp | 23 |
3 files changed, 9 insertions, 66 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 12e9c8cc..ee8e1232 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,7 @@ PROJECT( rekonq ) # Informations to update before to release this package. # rekonq info -SET(REKONQ_VERSION "0.7.52" ) +SET(REKONQ_VERSION "0.7.53" ) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/version.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/version.h ) @@ -22,7 +22,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6.4) FIND_PACKAGE(Qt4 4.7.0 COMPONENTS QtCore QtGui QtNetwork QtWebKit REQUIRED) -FIND_PACKAGE(KDE4 4.5.0 REQUIRED) +FIND_PACKAGE(KDE4 4.6.90 REQUIRED) INCLUDE(MacroOptionalFindPackage) INCLUDE(FindPackageHandleStandardArgs) diff --git a/src/networkaccessmanager.cpp b/src/networkaccessmanager.cpp index 9a500cf8..78a880e7 100644 --- a/src/networkaccessmanager.cpp +++ b/src/networkaccessmanager.cpp @@ -84,52 +84,12 @@ QNetworkReply *NetworkAccessManager::createRequest(QNetworkAccessManager::Operat req.setAttribute(QNetworkRequest::CacheLoadControlAttribute, QNetworkRequest::PreferCache); break; } - - // WARNING - // There are actually 2 exceptions here handled with QNAM - // instead of KIO that need fixes upstream before removing. They are: - // 1) DeleteOperation - // 2) CustomOperation - - switch (op) - { - case QNetworkAccessManager::HeadOperation: - break; - - case QNetworkAccessManager::GetOperation: + + // Handle GET operations with AdBlock + if (op == QNetworkAccessManager::GetOperation) reply = rApp->adblockManager()->block(req, parentPage); - break; - - case QNetworkAccessManager::PutOperation: - break; - - case QNetworkAccessManager::PostOperation: - break; - - // This particular issue has been solved for KDE Version 4.5.96, - // so we can safely disable this piece of code -#if !KDE_IS_VERSION( 4, 5, 96) - - case QNetworkAccessManager::DeleteOperation: - kDebug() << "DELETE OPERATION..."; - reply = QNetworkAccessManager::createRequest(op, req, outgoingData); - if (!reply) - kDebug() << "OOOOOOOOOOOOOOOOOOO DELETE REPLY NULL"; - break; - - case QNetworkAccessManager::CustomOperation: - kDebug() << "CUSTOM OPERATION..."; - reply = QNetworkAccessManager::createRequest(op, req, outgoingData); - if (!reply) - kDebug() << "OOOOOOOOOOOOOOOOOOO CUSTOM REPLY NULL"; - break; - -#endif - default: - kDebug() << "NON EXTANT CASE..."; - break; - } + if (!reply) reply = AccessManager::createRequest(op, req, outgoingData); 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; } |