summaryrefslogtreecommitdiff
path: root/src/webpage.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/webpage.cpp')
-rw-r--r--src/webpage.cpp23
1 files changed, 3 insertions, 20 deletions
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;
}