[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=950066c

The following commit has been merged in the master branch:
commit 950066c441a0929fe59a0c68c679aff9c5570091
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Wed Aug 10 16:23:59 2011 +0100

    Do not exit if setUri fails
---
 src/handle-incoming-file-transfer-channel-job.cpp | 9 +++------
 src/telepathy-base-job.h                          | 2 --
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/handle-incoming-file-transfer-channel-job.cpp b/src/handle-incoming-file-transfer-channel-job.cpp
index 10dbe43..d9c81d3 100644
--- a/src/handle-incoming-file-transfer-channel-job.cpp
+++ b/src/handle-incoming-file-transfer-channel-job.cpp
@@ -182,12 +182,9 @@ void HandleIncomingFileTransferChannelJobPrivate::__k__onSetUriOperationFinished
     Q_Q(HandleIncomingFileTransferChannelJob);
 
     if (op->isError()) {
-        kWarning() << "Unable to set the URI -" <<
-            op->errorName() << ":" << op->errorMessage();
-        q->setError(KTelepathy::SetUriFailed);
-        q->setErrorText(i18n("Unable to set the URI"));
-        QTimer::singleShot(0, q, SLOT(__k__doEmitResult()));
-        return;
+        // We do not want to exit if setUri failed, but we try to send the file
+        // anyway. Anyway we print a message for debugging purposes.
+        kWarning() << "Unable to set the URI -" << op->errorName() << ":" << op->errorMessage();
     }
 
     Tp::PendingOperation* acceptFileOperation = channel->acceptFile(offset, file);
diff --git a/src/telepathy-base-job.h b/src/telepathy-base-job.h
index a009f69..a613c5a 100644
--- a/src/telepathy-base-job.h
+++ b/src/telepathy-base-job.h
@@ -63,8 +63,6 @@ namespace KTelepathy {
         NullChannel = 108,
         /** A required Tp::Feature is not ready */
         FeatureNotReady = 109,
-        /** Cannot set the URI property */
-        SetUriFailed = 110,
         /** Cannot accept file */
         AcceptFileError = 111,
         /** File transfer cancelled */

-- 
ktp-filetransfer-handler packaging