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

The following commit has been merged in the master branch:
commit a7f2a61d9e8253926db4ffdf7e5929439cae3039
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Wed Sep 28 19:35:10 2011 +0100

    Return when emitting result
---
 src/handle-incoming-file-transfer-channel-job.cpp | 2 ++
 src/handle-outgoing-file-transfer-channel-job.cpp | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/src/handle-incoming-file-transfer-channel-job.cpp b/src/handle-incoming-file-transfer-channel-job.cpp
index b39a13b..1b94a77 100644
--- a/src/handle-incoming-file-transfer-channel-job.cpp
+++ b/src/handle-incoming-file-transfer-channel-job.cpp
@@ -69,6 +69,7 @@ HandleIncomingFileTransferChannelJob::HandleIncomingFileTransferChannelJob(Tp::I
         kError() << "Channel cannot be NULL";
         setError(KTelepathy::NullChannel);
         setErrorText(i18n("Invalid channel"));
+        return;
     }
 
     Tp::Features features = Tp::Features() << Tp::FileTransferChannel::FeatureCore;
@@ -77,6 +78,7 @@ HandleIncomingFileTransferChannelJob::HandleIncomingFileTransferChannelJob(Tp::I
         kError() << "Channel must be ready with Tp::FileTransferChannel::FeatureCore";
         setError(KTelepathy::FeatureNotReady);
         setErrorText(i18n("Channel is not ready"));
+        return;
     }
 
     setCapabilities(KJob::Killable);
diff --git a/src/handle-outgoing-file-transfer-channel-job.cpp b/src/handle-outgoing-file-transfer-channel-job.cpp
index fa8a23f..c720dff 100644
--- a/src/handle-outgoing-file-transfer-channel-job.cpp
+++ b/src/handle-outgoing-file-transfer-channel-job.cpp
@@ -62,6 +62,7 @@ HandleOutgoingFileTransferChannelJob::HandleOutgoingFileTransferChannelJob(Tp::O
         kError() << "Channel cannot be NULL";
         setError(KTelepathy::NullChannel);
         setErrorText(i18n("Invalid channel"));
+        return;
     }
 
     Tp::Features features = Tp::Features() << Tp::FileTransferChannel::FeatureCore;
@@ -70,6 +71,7 @@ HandleOutgoingFileTransferChannelJob::HandleOutgoingFileTransferChannelJob(Tp::O
         kError() << "Channel must be ready with Tp::FileTransferChannel::FeatureCore";
         setError(KTelepathy::FeatureNotReady);
         setErrorText(i18n("Channel is not ready"));
+        return;
     }
 
     connect(channel.data(),
@@ -188,6 +190,7 @@ void HandleOutgoingFileTransferChannelJobPrivate::__k__provideFile()
         q->setError(KTelepathy::UriPropertyMissing);
         q->setErrorText(i18n("URI property is missing"));
         QTimer::singleShot(0, q, SLOT(__k__doEmitResult()));
+        return;
     }
     if (!uri.isLocalFile())
     {
@@ -196,6 +199,7 @@ void HandleOutgoingFileTransferChannelJobPrivate::__k__provideFile()
         q->setError(KTelepathy::NotALocalFile);
         q->setErrorText(i18n("This is not a local file"));
         QTimer::singleShot(0, q, SLOT(__k__doEmitResult()));
+        return;
     }
 
     file = new QFile(uri.toLocalFile(), q->parent());

-- 
ktp-filetransfer-handler packaging