[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=32df541

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

    Save url in private class
---
 src/handle-incoming-file-transfer-channel-job.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/handle-incoming-file-transfer-channel-job.cpp b/src/handle-incoming-file-transfer-channel-job.cpp
index 0205a82..639cc0d 100644
--- a/src/handle-incoming-file-transfer-channel-job.cpp
+++ b/src/handle-incoming-file-transfer-channel-job.cpp
@@ -46,6 +46,7 @@ class HandleIncomingFileTransferChannelJobPrivate : public KTp::TelepathyBaseJob
 
         Tp::IncomingFileTransferChannelPtr channel;
         QString downloadDirectory;
+        KUrl url;
         qulonglong offset;
         QFile* file;
 
@@ -165,7 +166,7 @@ void HandleIncomingFileTransferChannelJobPrivate::__k__start()
 
     offset = 0;
 
-    KUrl url(downloadDirectory);
+    url = downloadDirectory;
     url.addPath(channel->fileName());
     url.setScheme(QLatin1String("file"));
 
@@ -174,9 +175,8 @@ void HandleIncomingFileTransferChannelJobPrivate::__k__start()
                           qMakePair<QString, QString>(i18n("From"), channel->targetContact()->alias()),
                           qMakePair<QString, QString>(i18n("Filename"), url.toLocalFile()));
 
-    QFileInfo fileInfo(url.toLocalFile());
-    if (fileInfo.exists()) // TODO check if it is a dir?
-    {
+    QFileInfo fileInfo(url.toLocalFile()); // TODO check if it is a dir?
+    if (fileInfo.exists()) {
         QWeakPointer<KIO::RenameDialog> renameDialog = new KIO::RenameDialog(0,
                                                                              i18n("Incoming file exists"),
                                                                              KUrl(), //TODO

-- 
ktp-filetransfer-handler packaging