[Pkg-owncloud-commits] [owncloud-client] 97/219: AbstractNetworkJob

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit af5e8ee18ca6bc9de63df65bd29d1314864bf507
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Fri Sep 12 18:06:29 2014 +0200

    AbstractNetworkJob
    
    Abort the transfer in case of timeout.
    
    This avoid that a connection that never replies blocks mirall
    
    Issue #2148
---
 src/mirall/networkjobs.cpp | 7 +++++++
 src/mirall/networkjobs.h   | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/mirall/networkjobs.cpp b/src/mirall/networkjobs.cpp
index fd0ee98..0f28a92 100644
--- a/src/mirall/networkjobs.cpp
+++ b/src/mirall/networkjobs.cpp
@@ -193,6 +193,13 @@ void AbstractNetworkJob::start()
     qDebug() << "!!!" << metaObject()->className() << "created for" << account()->url() << "querying" << path();
 }
 
+void AbstractNetworkJob::slotTimeout()
+{
+    qDebug() <<  this << "Timeout" ;
+    reply()->abort();
+}
+
+
 /*********************************************************************************************/
 
 RequestEtagJob::RequestEtagJob(Account *account, const QString &path, QObject *parent)
diff --git a/src/mirall/networkjobs.h b/src/mirall/networkjobs.h
index 5b8c196..fc1687d 100644
--- a/src/mirall/networkjobs.h
+++ b/src/mirall/networkjobs.h
@@ -96,7 +96,7 @@ protected:
 
 private slots:
     void slotFinished();
-    virtual void slotTimeout() {}
+    virtual void slotTimeout();
 
 private:
     QNetworkReply* addTimer(QNetworkReply *reply);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git