[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    =?utf-8?q?=5Bkdelibs/KDE/4=2E6=5D_kio/kio=3A_-_Automatically_cal?=
From:       Dawit Alemayehu <adawit () kde ! org>
Date:       2011-04-18 3:00:16
Message-ID: 20110418030016.0DC9AA60A6 () git ! kde ! org
[Download RAW message or body]

Git commit 003d0fdf4a8a9744bb0b02e6b1f7acddb1afa5f9 by Dawit Alemayehu.
Committed on 18/04/2011 at 03:44.
Pushed by adawit into branch 'KDE/4.6'.

- Automatically call KIO::Scheduler::publishSlaveOnHold whenever putOnHold
  is called.

- Since the job is useless without its ioslave, emit the finished signal when
  putOnHold is called.

- Minor code clean up.

M  +8    -3    kio/kio/accessmanagerreply_p.cpp     

http://commits.kde.org/kdelibs/003d0fdf4a8a9744bb0b02e6b1f7acddb1afa5f9

diff --git a/kio/kio/accessmanagerreply_p.cpp b/kio/kio/accessmanagerreply_p.cpp
index 90cf4db..39f4447 100644
--- a/kio/kio/accessmanagerreply_p.cpp
+++ b/kio/kio/accessmanagerreply_p.cpp
@@ -25,6 +25,7 @@
 #include "accessmanagerreply_p.h"
 #include "accessmanager.h"
 #include "job.h"
+#include "scheduler.h"
 
 #include <kdebug.h>
 #include <kprotocolinfo.h>
@@ -50,10 +51,10 @@ AccessManagerReply::AccessManagerReply(const QNetworkAccessManager::Operation &o
                                        QObject *parent)
                    :QNetworkReply(parent),
                     m_metaDataRead(false),
-                    m_ignoreContentDisposition(false)
+                    m_ignoreContentDisposition(false),
+                    m_kioJob(kioJob)
 
 {
-    m_kioJob = kioJob;
     setRequest(request);
     setOpenMode(QIODevice::ReadOnly);
     setUrl(request.url());
@@ -126,6 +127,10 @@ void AccessManagerReply::putOnHold()
         return;
 
     m_kioJob->putOnHold();
+    KIO::Scheduler::publishSlaveOnHold();
+
+    m_kioJob = 0;
+    finished();
 }
 
 static bool isStatusCodeSuccess(const QNetworkReply* reply)
@@ -308,7 +313,7 @@ void AccessManagerReply::slotResult(KJob *kJob)
 
     const QUrl redirectUrl = attribute(QNetworkRequest::RedirectionTargetAttribute).toUrl();
     if (redirectUrl.isValid() || !hasRawHeader("content-type")) {
-        readHttpResponseHeaders(m_kioJob);
+        readHttpResponseHeaders(qobject_cast<KIO::Job*>(kJob));
     } else {
         setAttribute(static_cast<QNetworkRequest::Attribute>(KIO::AccessManager::KioError), errcode);
         if (errcode)


[prev in list] [next in list] [prev in thread] [next in thread]