[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=0035b9c

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

    Partial revert of "Fix comment"
    
    I committed by mistake some stuff that wasn't supposed to be committed.
    
    This reverts commit 89cff55d05973b0cf78a45108bca9f4d2150777c.
---
 src/CMakeLists.txt           |  1 -
 src/filetransfer-handler.cpp | 14 ++++++++++++--
 src/filetransfer-handler.h   |  9 ++++++++-
 src/main.cpp                 | 11 ++++-------
 4 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 834b4fc..9e84a8b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,6 +1,5 @@
 set (telepathy_kde_filetransfer_handler_SRCS
      main.cpp
-     control.cpp
      filetransfer-handler.cpp
      telepathy-base-job.cpp
      handle-incoming-file-transfer-channel-job.cpp
diff --git a/src/filetransfer-handler.cpp b/src/filetransfer-handler.cpp
index 54946d3..0e4624e 100644
--- a/src/filetransfer-handler.cpp
+++ b/src/filetransfer-handler.cpp
@@ -35,10 +35,12 @@
 #include <QApplication>
 
 
-FileTransferHandler::FileTransferHandler(QObject *parent)
+FileTransferHandler::FileTransferHandler(bool persist, QObject *parent)
     : QObject(parent),
       Tp::AbstractClientHandler(Tp::ChannelClassSpecList() << Tp::ChannelClassSpec::incomingFileTransfer()
-                                                           << Tp::ChannelClassSpec::outgoingFileTransfer())
+                                                           << Tp::ChannelClassSpec::outgoingFileTransfer()),
+      m_persist(persist),
+      m_jobCount(0)
 {
 }
 
@@ -138,3 +140,11 @@ void FileTransferHandler::handleResult(KJob* job)
 
     QTimer::singleShot(2000, this, SLOT(onTimeout()));
 }
+
+void FileTransferHandler::onTimeout()
+{
+    if (!m_persist && m_jobCount.fetchAndAddOrdered(-1) <= 1) {
+        kDebug() << "Timeout. Exiting";
+        QApplication::quit();
+    }
+}
diff --git a/src/filetransfer-handler.h b/src/filetransfer-handler.h
index c6aabb9..6fd6c4b 100644
--- a/src/filetransfer-handler.h
+++ b/src/filetransfer-handler.h
@@ -33,7 +33,7 @@ class FileTransferHandler : public QObject, public Tp::AbstractClientHandler
     Q_DISABLE_COPY(FileTransferHandler);
 
 public:
-    FileTransferHandler(QObject* parent = 0);
+    FileTransferHandler(bool persist, QObject* parent = 0);
     virtual ~FileTransferHandler();
 
     virtual bool bypassApproval() const;
@@ -45,9 +45,16 @@ public:
                         const QDateTime &userActionTime,
                         const Tp::AbstractClientHandler::HandlerInfo &handlerInfo);
 
+public Q_SLOTS:
+    void onTimeout();
+
 private Q_SLOTS:
     void onInfoMessage(KJob* job, const QString &plain, const QString &rich);
     void handleResult(KJob* job);
+
+private:
+    bool m_persist;
+    QAtomicInt m_jobCount;
 };
 
 #endif // TELEPATHY_KDE_FILETRANSFER_HANDLER_H
diff --git a/src/main.cpp b/src/main.cpp
index ede2d4b..c8c52d3 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -15,7 +15,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "control.h"
 #include "filetransfer-handler.h"
 
 #include <TelepathyQt4/Debug>
@@ -45,10 +44,6 @@ int main(int argc, char* argv[])
     KApplication app;
     app.setQuitOnLastWindowClosed(false);
 
-    // Create static Control object before starting anything that could be
-    // multithreaded to avoid problems.
-    new Control(KCmdLineArgs::parsedArgs()->isSet("persist"), &app);
-
     Tp::registerTypes();
     //Enable telepathy-Qt4 debug
     Tp::enableDebug(KCmdLineArgs::parsedArgs()->isSet("debug"));
@@ -71,8 +66,10 @@ int main(int argc, char* argv[])
                                                                    channelFactory,
                                                                    contactFactory);
 
-    Tp::SharedPtr<FileTransferHandler> fth = Tp::SharedPtr<FileTransferHandler>(new FileTransferHandler());
-    registrar->registerClient(Tp::AbstractClientPtr(fth), QLatin1String("KDE.FileTransfer"));
+    Tp::SharedPtr<FileTransferHandler> fth = Tp::SharedPtr<FileTransferHandler>(
+            new FileTransferHandler(KCmdLineArgs::parsedArgs()->isSet("persist")));
+    registrar->registerClient(Tp::AbstractClientPtr(fth),
+                              QLatin1String("KDE.FileTransfer"));
 
     QTimer::singleShot(2000, fth.data(), SLOT(onTimeout()));
 

-- 
ktp-filetransfer-handler packaging