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

The following commit has been merged in the master branch:
commit f9335652bd252b256e92f89594761840b4a2916e
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Sun Dec 18 19:59:18 2011 +0100

    kill() does not need to be asyncronous
---
 src/handle-outgoing-file-transfer-channel-job.cpp | 9 ++++-----
 src/handle-outgoing-file-transfer-channel-job.h   | 3 +--
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/handle-outgoing-file-transfer-channel-job.cpp b/src/handle-outgoing-file-transfer-channel-job.cpp
index 28972e7..f02d2cf 100644
--- a/src/handle-outgoing-file-transfer-channel-job.cpp
+++ b/src/handle-outgoing-file-transfer-channel-job.cpp
@@ -47,11 +47,10 @@ class HandleOutgoingFileTransferChannelJobPrivate : public KTp::TelepathyBaseJob
         qulonglong offset;
 
         void init();
+        bool kill();
         void provideFile();
 
         void __k__start();
-        bool __k__kill();
-
         void __k__onInitialOffsetDefined(qulonglong offset);
         void __k__onFileTransferChannelStateChanged(Tp::FileTransferState state, Tp::FileTransferStateChangeReason reason);
         void __k__onFileTransferChannelTransferredBytesChanged(qulonglong count);
@@ -89,8 +88,8 @@ void HandleOutgoingFileTransferChannelJob::start()
 bool HandleOutgoingFileTransferChannelJob::doKill()
 {
     kDebug() << "Outgoing file transfer killed.";
-    QTimer::singleShot(0, this, SLOT(__k__kill()));
-    return true;
+    Q_D(HandleOutgoingFileTransferChannelJob);
+    return d->kill();
 }
 
 HandleOutgoingFileTransferChannelJobPrivate::HandleOutgoingFileTransferChannelJobPrivate()
@@ -187,7 +186,7 @@ void HandleOutgoingFileTransferChannelJobPrivate::__k__start()
     }
 }
 
-bool HandleOutgoingFileTransferChannelJobPrivate::__k__kill()
+bool HandleOutgoingFileTransferChannelJobPrivate::kill()
 {
     kDebug();
     Q_Q(HandleOutgoingFileTransferChannelJob);
diff --git a/src/handle-outgoing-file-transfer-channel-job.h b/src/handle-outgoing-file-transfer-channel-job.h
index f4b52f1..aa58dce 100644
--- a/src/handle-outgoing-file-transfer-channel-job.h
+++ b/src/handle-outgoing-file-transfer-channel-job.h
@@ -37,6 +37,7 @@ class HandleOutgoingFileTransferChannelJob : public KTp::TelepathyBaseJob
     Q_DECLARE_PRIVATE(HandleOutgoingFileTransferChannelJob)
 
 //     // Our Q_PRIVATE_SLOTS who perform the real job
+    Q_PRIVATE_SLOT(d_func(), void __k__start())
     Q_PRIVATE_SLOT(d_func(), void __k__onInitialOffsetDefined(qulonglong offset))
     Q_PRIVATE_SLOT(d_func(), void __k__onFileTransferChannelStateChanged(Tp::FileTransferState state, Tp::FileTransferStateChangeReason reason))
     Q_PRIVATE_SLOT(d_func(), void __k__onFileTransferChannelTransferredBytesChanged(qulonglong count))
@@ -44,8 +45,6 @@ class HandleOutgoingFileTransferChannelJob : public KTp::TelepathyBaseJob
     Q_PRIVATE_SLOT(d_func(), void __k__onCancelOperationFinished(Tp::PendingOperation* op))
     Q_PRIVATE_SLOT(d_func(), void __k__onInvalidated())
 
-    Q_PRIVATE_SLOT(d_func(), void __k__start())
-    Q_PRIVATE_SLOT(d_func(), void __k__kill())
 
 public:
     explicit HandleOutgoingFileTransferChannelJob(Tp::OutgoingFileTransferChannelPtr channel,

-- 
ktp-filetransfer-handler packaging