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

The following commit has been merged in the master branch:
commit e97808427a11893b8818d39de8489c36a97a5897
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Wed Sep 28 20:08:46 2011 +0100

    Fix notification on file transfer cancelled
---
 src/handle-incoming-file-transfer-channel-job.cpp |  7 +++----
 src/handle-outgoing-file-transfer-channel-job.cpp | 10 +++-------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/src/handle-incoming-file-transfer-channel-job.cpp b/src/handle-incoming-file-transfer-channel-job.cpp
index 12ac404..139bdef 100644
--- a/src/handle-incoming-file-transfer-channel-job.cpp
+++ b/src/handle-incoming-file-transfer-channel-job.cpp
@@ -91,7 +91,9 @@ void HandleIncomingFileTransferChannelJob::start()
 
 bool HandleIncomingFileTransferChannelJob::doKill()
 {
-    kDebug();
+    kWarning() << "Incoming file transfer was canceled.";
+    setError(KTelepathy::FileTransferCancelled);
+    setErrorText(i18n("Incoming file transfer was canceled."));
     QTimer::singleShot(0, this, SLOT(__k__kill()));
     return true;
 }
@@ -284,9 +286,6 @@ void HandleIncomingFileTransferChannelJobPrivate::__k__onFileTransferChannelStat
             QTimer::singleShot(0, q, SLOT(__k__doEmitResult()));
             break;
         case Tp::FileTransferStateCancelled:
-            kWarning() << "Incoming file transfer was canceled.";
-            q->setError(KTelepathy::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 b8b206f..41d32ab 100644
--- a/src/handle-outgoing-file-transfer-channel-job.cpp
+++ b/src/handle-outgoing-file-transfer-channel-job.cpp
@@ -85,7 +85,9 @@ void HandleOutgoingFileTransferChannelJob::start()
 
 bool HandleOutgoingFileTransferChannelJob::doKill()
 {
-    kDebug();
+    kWarning() << "Outgoing file transfer was canceled.";
+    setError(KTelepathy::FileTransferCancelled);
+    setErrorText(i18n("Outgoing file transfer was canceled."));
     QTimer::singleShot(0, this, SLOT(__k__kill()));
     return true;
 }
@@ -185,9 +187,6 @@ bool HandleOutgoingFileTransferChannelJobPrivate::__k__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*)),
@@ -218,9 +217,6 @@ void HandleOutgoingFileTransferChannelJobPrivate::__k__onFileTransferChannelStat
             QTimer::singleShot(0, q, SLOT(__k__doEmitResult()));
             break;
         case Tp::FileTransferStateCancelled:
-            kWarning() << "Outgoing file transfer was canceled.";
-            q->setError(KTelepathy::FileTransferCancelled);
-            q->setErrorText(i18n("Outgoing file transfer was canceled."));
             q->kill(KJob::Quietly);
             break;
         case Tp::FileTransferStateAccepted:

-- 
ktp-filetransfer-handler packaging