[SCM] kdeconnect packaging branch, master, updated. debian/0.9g-1-1183-g9d69498

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=e4c3e8c

The following commit has been merged in the master branch:
commit e4c3e8c4cd2028d92fbf247b56c660c3f2a4206b
Author: Àlex Fiestas <afiestas at kde.org>
Date:   Mon Mar 3 22:34:03 2014 +0100

    Implement virtual KJob::doKill in FileTransferJob
    
    This basically allows killing the job from the JobTrakcer
    aka Plasma.
---
 kded/filetransferjob.cpp | 10 ++++++++++
 kded/filetransferjob.h   |  2 ++
 2 files changed, 12 insertions(+)

diff --git a/kded/filetransferjob.cpp b/kded/filetransferjob.cpp
index 7eb702a..62d2f2e 100644
--- a/kded/filetransferjob.cpp
+++ b/kded/filetransferjob.cpp
@@ -201,3 +201,13 @@ void FileTransferJob::sourceFinished()
     emitResult();
 }
 
+bool FileTransferJob::doKill()
+{
+    if (mDestinationJob) {
+        mDestinationJob->close();
+    }
+    if (mOrigin) {
+        mOrigin->close();
+    }
+    return true;
+}
diff --git a/kded/filetransferjob.h b/kded/filetransferjob.h
index b710422..2378fc3 100644
--- a/kded/filetransferjob.h
+++ b/kded/filetransferjob.h
@@ -50,6 +50,8 @@ public Q_SLOTS:
     void sourceFinished();
     void openFinished(KJob*);
 
+protected:
+    virtual bool doKill();
 private:
     void startTransfer();
     QSharedPointer<QIODevice> mOrigin;

-- 
kdeconnect packaging