[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=22c1f84

The following commit has been merged in the master branch:
commit 22c1f84f37ef31f034fb0996597d8a8853d4f10b
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Sun Dec 18 01:58:14 2011 +0100

    Do some cleanup when ft is cancelled
---
 src/handle-incoming-file-transfer-channel-job.cpp | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/handle-incoming-file-transfer-channel-job.cpp b/src/handle-incoming-file-transfer-channel-job.cpp
index 96cbab7..00d9cd5 100644
--- a/src/handle-incoming-file-transfer-channel-job.cpp
+++ b/src/handle-incoming-file-transfer-channel-job.cpp
@@ -425,10 +425,21 @@ void HandleIncomingFileTransferChannelJobPrivate::__k__onFileTransferChannelStat
             break;
         }
         case Tp::FileTransferStateCancelled:
+        {
             q->setError(KTp::FileTransferCancelled);
             q->setErrorText(i18n("Incoming file transfer was canceled."));
+            // Close .part file if open
+            if (file->isOpen()) {
+                file->close();
+            }
+            // Delete the old file if exists
+            QFile oldFile(url.toLocalFile(), 0);
+            if (oldFile.exists()) {
+                oldFile.remove();
+            }
             q->kill(KJob::Quietly);
             break;
+        }
         case Tp::FileTransferStateAccepted:
         case Tp::FileTransferStatePending:
         case Tp::FileTransferStateOpen:

-- 
ktp-filetransfer-handler packaging