[SCM] ktp-filetransfer-handler packaging branch, master, updated. debian/15.12.1-2-226-g825cd93

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-filetransfer-handler.git;a=commitdiff;h=9708b16

The following commit has been merged in the master branch:
commit 9708b167027cd9bb58194d35f00c4cc700e3bbb5
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Wed Sep 28 19:35:41 2011 +0100

    Handle kill in a private method
---
 src/handle-incoming-file-transfer-channel-job.cpp | 21 +++++++++++++-------
 src/handle-outgoing-file-transfer-channel-job.cpp | 24 ++++++++++++++++-------
 2 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/src/handle-incoming-file-transfer-channel-job.cpp b/src/handle-incoming-file-transfer-channel-job.cpp
index ee5c1fb..7a86c6b 100644
--- a/src/handle-incoming-file-transfer-channel-job.cpp
+++ b/src/handle-incoming-file-transfer-channel-job.cpp
@@ -51,6 +51,7 @@ class HandleIncomingFileTransferChannelJobPrivate : public KTelepathy::Telepathy
 
         void init();
         void start();
+        bool kill();
 
         void __k__onSetUriOperationFinished(Tp::PendingOperation* op);
         void __k__onFileTransferChannelStateChanged(Tp::FileTransferState state, Tp::FileTransferStateChangeReason reason);
@@ -89,13 +90,7 @@ bool HandleIncomingFileTransferChannelJob::doKill()
 {
     kDebug();
     Q_D(HandleIncomingFileTransferChannelJob);
-
-    //TODO suspend the transfer?
-    Tp::PendingOperation *cancelOperation = d->channel->cancel();
-    connect(cancelOperation,
-            SIGNAL(finished(Tp::PendingOperation*)),
-            SLOT(__k__onCancelOperationFinished(Tp::PendingOperation*)));
-    return true;
+    return d->kill();
 }
 
 HandleIncomingFileTransferChannelJobPrivate::HandleIncomingFileTransferChannelJobPrivate()
@@ -231,6 +226,18 @@ void HandleIncomingFileTransferChannelJobPrivate::start()
                SLOT(__k__onSetUriOperationFinished(Tp::PendingOperation*)));
 }
 
+bool HandleIncomingFileTransferChannelJobPrivate::kill()
+{
+    kDebug();
+    Q_Q(HandleIncomingFileTransferChannelJob);
+
+    Tp::PendingOperation *cancelOperation = channel->cancel();
+    q->connect(cancelOperation,
+               SIGNAL(finished(Tp::PendingOperation*)),
+               SLOT(__k__onCancelOperationFinished(Tp::PendingOperation*)));
+    return true;
+}
+
 void HandleIncomingFileTransferChannelJobPrivate::__k__onSetUriOperationFinished(Tp::PendingOperation* op)
 {
     kDebug();
diff --git a/src/handle-outgoing-file-transfer-channel-job.cpp b/src/handle-outgoing-file-transfer-channel-job.cpp
index e487489..365d30a 100644
--- a/src/handle-outgoing-file-transfer-channel-job.cpp
+++ b/src/handle-outgoing-file-transfer-channel-job.cpp
@@ -47,6 +47,7 @@ class HandleOutgoingFileTransferChannelJobPrivate : public KTelepathy::Telepathy
 
         void init();
         void start();
+        bool kill();
         void provideFile();
 
         void __k__onFileTransferChannelStateChanged(Tp::FileTransferState state, Tp::FileTransferStateChangeReason reason);
@@ -83,13 +84,7 @@ bool HandleOutgoingFileTransferChannelJob::doKill()
 {
     kDebug();
     Q_D(HandleOutgoingFileTransferChannelJob);
-
-    //TODO suspend the transfer?
-    Tp::PendingOperation *cancelOperation = d->channel->cancel();
-    connect(cancelOperation,
-            SIGNAL(finished(Tp::PendingOperation*)),
-            SLOT(__k__onCancelOperationFinished(Tp::PendingOperation*)));
-    return true;
+    return d->kill();
 }
 
 HandleOutgoingFileTransferChannelJobPrivate::HandleOutgoingFileTransferChannelJobPrivate()
@@ -182,6 +177,21 @@ void HandleOutgoingFileTransferChannelJobPrivate::start()
     }
 }
 
+bool HandleOutgoingFileTransferChannelJobPrivate::kill()
+{
+    kDebug();
+    Q_Q(HandleOutgoingFileTransferChannelJob);
+
+    q->setError(KTelepathy::FileTransferCancelled);
+    q->setErrorText(i18n("Outgoing file transfer was canceled."));
+
+    Tp::PendingOperation *cancelOperation = channel->cancel();
+    q->connect(cancelOperation,
+               SIGNAL(finished(Tp::PendingOperation*)),
+               SLOT(__k__onCancelOperationFinished(Tp::PendingOperation*)));
+    return true;
+}
+
 void HandleOutgoingFileTransferChannelJobPrivate::__k__onFileTransferChannelStateChanged(Tp::FileTransferState state,
                                                                                          Tp::FileTransferStateChangeReason stateReason)
 {

-- 
ktp-filetransfer-handler packaging