[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=2cb0b83

The following commit has been merged in the master branch:
commit 2cb0b83c576aa6580f8e89cd5f58b379dff39839
Author: Andrea Scarpino <andrea at archlinux.org>
Date:   Thu Feb 14 12:05:57 2013 +0059

    Do not delete the old file when the sender cancel the transfer and you
    are in the rename dialog
    
    Reviewed-by: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
---
 src/handle-incoming-file-transfer-channel-job.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/handle-incoming-file-transfer-channel-job.cpp b/src/handle-incoming-file-transfer-channel-job.cpp
index 6a59a87..4ae29be 100644
--- a/src/handle-incoming-file-transfer-channel-job.cpp
+++ b/src/handle-incoming-file-transfer-channel-job.cpp
@@ -226,6 +226,11 @@ void HandleIncomingFileTransferChannelJobPrivate::__k__onRenameDialogFinished(in
         url = renameDialog.data()->newDestUrl();
         break;
     case KIO::R_OVERWRITE:
+        // Delete the old file if exists
+        QFile oldFile(url.toLocalFile(), 0);
+        if (oldFile.exists()) {
+            oldFile.remove();
+        }
         break;
     default:
         kWarning() << "Unknown Error";
@@ -433,11 +438,6 @@ void HandleIncomingFileTransferChannelJobPrivate::__k__onFileTransferChannelStat
         if (file && 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;
     }

-- 
ktp-filetransfer-handler packaging