[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=0bab716

The following commit has been merged in the master branch:
commit 0bab716ee4e988b5775746d26b5c999762722a15
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Tue Jun 7 10:50:37 2011 +0200

    Exit on error
---
 src/handle-incoming-file-transfer-channel-job.cpp | 3 +++
 src/handle-outgoing-file-transfer-channel-job.cpp | 3 +++
 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 3838ba2..41d3e5e 100644
--- a/src/handle-incoming-file-transfer-channel-job.cpp
+++ b/src/handle-incoming-file-transfer-channel-job.cpp
@@ -63,6 +63,7 @@ HandleIncomingFileTransferChannelJob::HandleIncomingFileTransferChannelJob(Tp::I
     if (channel.isNull())
     {
         kError() << "Channel cannot be NULL"; // TODO print a serious message
+        d->__k__onInvalidated();
         // TODO set error
     }
 
@@ -70,6 +71,7 @@ HandleIncomingFileTransferChannelJob::HandleIncomingFileTransferChannelJob(Tp::I
     if (!channel->isReady(Tp::Features() << Tp::FileTransferChannel::FeatureCore))
     {
         kError() << "Channel must be ready with Tp::FileTransferChannel::FeatureCore"; // TODO print a serious message
+        d->__k__onInvalidated();
         // TODO set error
     }
 
@@ -176,6 +178,7 @@ void HandleIncomingFileTransferChannelJobPrivate::__k__onAcceptFileFinished(Tp::
     if (op->isError()) {
         kWarning() << "Unable to accept file -" <<
             op->errorName() << ":" << op->errorMessage();
+        //TODO set error
         __k__onInvalidated();
         return;
     }
diff --git a/src/handle-outgoing-file-transfer-channel-job.cpp b/src/handle-outgoing-file-transfer-channel-job.cpp
index 921da81..e04ebf3 100644
--- a/src/handle-outgoing-file-transfer-channel-job.cpp
+++ b/src/handle-outgoing-file-transfer-channel-job.cpp
@@ -60,6 +60,7 @@ HandleOutgoingFileTransferChannelJob::HandleOutgoingFileTransferChannelJob(Tp::O
     {
         kError() << "Channel cannot be NULL"; // TODO print a serious message
         // TODO set error
+        d->__k__onInvalidated();
     }
 
     Tp::Features features = Tp::Features() << Tp::FileTransferChannel::FeatureCore;
@@ -67,6 +68,7 @@ HandleOutgoingFileTransferChannelJob::HandleOutgoingFileTransferChannelJob(Tp::O
     {
         kError() << "Channel must be ready with Tp::FileTransferChannel::FeatureCore"; // TODO print a serious message
         // TODO set error
+        d->__k__onInvalidated();
     }
 
     connect(channel.data(),
@@ -196,6 +198,7 @@ void HandleOutgoingFileTransferChannelJobPrivate::__k__onProvideFileFinished(Tp:
     if (op->isError()) {
         kWarning() << "Unable to provide file - " <<
             op->errorName() << ":" << op->errorMessage();
+        //TODO Set error
         __k__onInvalidated();
         return;
     }

-- 
ktp-filetransfer-handler packaging