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

The following commit has been merged in the master branch:
commit c37d3612015fd0c058b5c56fd2bb41f4c81d26cd
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Tue Jul 10 23:58:34 2012 +0200

    Return after context finishes with error
---
 src/filetransfer-handler.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/filetransfer-handler.cpp b/src/filetransfer-handler.cpp
index c79a22a..0ef9093 100644
--- a/src/filetransfer-handler.cpp
+++ b/src/filetransfer-handler.cpp
@@ -67,6 +67,7 @@ void FileTransferHandler::handleChannels(const Tp::MethodInvocationContextPtr<>
         if (KTp::TelepathyHandlerApplication::newJob() < 0) {
             context->setFinishedWithError(QLatin1String("org.freedesktop.Telepathy.KTp.FileTransferHandler.Exiting"),
                                           i18n("File transfer handler is exiting. Cannot start job"));
+            return;
         }
 
         KJob* job = NULL;
@@ -95,6 +96,7 @@ void FileTransferHandler::handleChannels(const Tp::MethodInvocationContextPtr<>
             if (outgoingFileTransferChannel->uri().isEmpty()) {
                 context->setFinishedWithError(TP_QT_ERROR_INCONSISTENT,
                                             i18n("Cannot handle outgoing file transfer without URI"));
+                return;
             }
 
             job = new HandleOutgoingFileTransferChannelJob(outgoingFileTransferChannel, this);

-- 
ktp-filetransfer-handler packaging