[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=84a8656

The following commit has been merged in the master branch:
commit 84a8656bf6bfae47501510ce6e2ea3c5e90c409f
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Wed Jun 15 23:40:12 2011 +0200

    Add some debug
---
 src/filetransfer-handler.cpp                      | 2 +-
 src/handle-incoming-file-transfer-channel-job.cpp | 1 -
 src/telepathy-base-job.cpp                        | 2 ++
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/filetransfer-handler.cpp b/src/filetransfer-handler.cpp
index 8730f4d..6ed20bb 100644
--- a/src/filetransfer-handler.cpp
+++ b/src/filetransfer-handler.cpp
@@ -145,7 +145,7 @@ void FileTransferHandler::handleResult(KJob* job)
 void FileTransferHandler::onTimeout()
 {
     if (!m_persist && m_jobCount.fetchAndAddOrdered(-1) <= 1) {
-        kDebug() << "Exiting";
+        kDebug() << "Timeout. Exiting";
         QApplication::quit();
     }
 }
diff --git a/src/handle-incoming-file-transfer-channel-job.cpp b/src/handle-incoming-file-transfer-channel-job.cpp
index eb5f79e..ba51bbf 100644
--- a/src/handle-incoming-file-transfer-channel-job.cpp
+++ b/src/handle-incoming-file-transfer-channel-job.cpp
@@ -155,7 +155,6 @@ void HandleIncomingFileTransferChannelJobPrivate::__k__start()
             case KIO::R_OVERWRITE:
                 break;
             default:
-                //TODO Set error
                 kWarning() << "Unknown Error";
                 q->setError(KTelepathy::KTelepathyError);
                 q->setErrorText(i18n("Unknown Error"));
diff --git a/src/telepathy-base-job.cpp b/src/telepathy-base-job.cpp
index 75d0dcc..4eee8da 100644
--- a/src/telepathy-base-job.cpp
+++ b/src/telepathy-base-job.cpp
@@ -23,6 +23,7 @@
 #include <TelepathyQt4/PendingOperation>
 
 #include <KLocalizedString>
+#include <KDebug>
 
 using namespace KTelepathy;
 
@@ -84,6 +85,7 @@ void TelepathyBaseJobPrivate::__k__tpOperationFinished(Tp::PendingOperation* op)
 
 void TelepathyBaseJobPrivate::__k__doEmitResult()
 {
+    kDebug();
     Q_Q(TelepathyBaseJob);
 
     // Before streaming out: are there any telepathy errors?

-- 
ktp-filetransfer-handler packaging