[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=ad2b896

The following commit has been merged in the master branch:
commit ad2b896874be76276bf49a1fb91f52d7c7947b13
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Sun Dec 18 00:28:44 2011 +0100

    Do not set error when user kills the jobs, set it on file transfer cancelled instead
---
 src/handle-incoming-file-transfer-channel-job.cpp | 6 +++---
 src/handle-outgoing-file-transfer-channel-job.cpp | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/handle-incoming-file-transfer-channel-job.cpp b/src/handle-incoming-file-transfer-channel-job.cpp
index 314f285..e218e6d 100644
--- a/src/handle-incoming-file-transfer-channel-job.cpp
+++ b/src/handle-incoming-file-transfer-channel-job.cpp
@@ -91,9 +91,7 @@ void HandleIncomingFileTransferChannelJob::start()
 
 bool HandleIncomingFileTransferChannelJob::doKill()
 {
-    kWarning() << "Incoming file transfer was canceled.";
-    setError(KTp::FileTransferCancelled);
-    setErrorText(i18n("Incoming file transfer was canceled."));
+    kDebug() << "Incoming file transfer killed.";
     KIO::getJobTracker()->unregisterJob(this);
     QTimer::singleShot(0, this, SLOT(__k__kill()));
     return true;
@@ -287,6 +285,8 @@ void HandleIncomingFileTransferChannelJobPrivate::__k__onFileTransferChannelStat
             QTimer::singleShot(0, q, SLOT(__k__doEmitResult()));
             break;
         case Tp::FileTransferStateCancelled:
+            q->setError(KTp::FileTransferCancelled);
+            q->setErrorText(i18n("Incoming file transfer was canceled."));
             q->kill(KJob::Quietly);
             break;
         case Tp::FileTransferStateAccepted:
diff --git a/src/handle-outgoing-file-transfer-channel-job.cpp b/src/handle-outgoing-file-transfer-channel-job.cpp
index ded0043..c4d61c0 100644
--- a/src/handle-outgoing-file-transfer-channel-job.cpp
+++ b/src/handle-outgoing-file-transfer-channel-job.cpp
@@ -85,9 +85,7 @@ void HandleOutgoingFileTransferChannelJob::start()
 
 bool HandleOutgoingFileTransferChannelJob::doKill()
 {
-    kWarning() << "Outgoing file transfer was canceled.";
-    setError(KTp::FileTransferCancelled);
-    setErrorText(i18n("Outgoing file transfer was canceled."));
+    kDebug() << "Outgoing file transfer killed.";
     KIO::getJobTracker()->unregisterJob(this);
     QTimer::singleShot(0, this, SLOT(__k__kill()));
     return true;
@@ -218,6 +216,8 @@ void HandleOutgoingFileTransferChannelJobPrivate::__k__onFileTransferChannelStat
             QTimer::singleShot(0, q, SLOT(__k__doEmitResult()));
             break;
         case Tp::FileTransferStateCancelled:
+            q->setError(KTp::FileTransferCancelled);
+            q->setErrorText(i18n("Outgoing file transfer was canceled."));
             q->kill(KJob::Quietly);
             break;
         case Tp::FileTransferStateAccepted:

-- 
ktp-filetransfer-handler packaging