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

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

    Let the jobs register by themselves
    
    This (or perhaps some previous commit) *seems* to fix the annoying
    bug #282960 (abandoned kjobs in the notification area), so I'll close
    the bug, I will open it again if it persists.
    
    BUG: 282960
---
 src/filetransfer-handler.cpp                      | 3 ---
 src/handle-incoming-file-transfer-channel-job.cpp | 3 +++
 src/handle-outgoing-file-transfer-channel-job.cpp | 3 +++
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/filetransfer-handler.cpp b/src/filetransfer-handler.cpp
index cdf5fa5..fee096e 100644
--- a/src/filetransfer-handler.cpp
+++ b/src/filetransfer-handler.cpp
@@ -29,8 +29,6 @@
 #include <KLocalizedString>
 #include <KJob>
 // #include <KNotification>
-#include <kio/global.h>
-#include <kjobtrackerinterface.h>
 #include <KDebug>
 
 
@@ -114,7 +112,6 @@ void FileTransferHandler::handleChannels(const Tp::MethodInvocationContextPtr<>
         }
 
         if (job) {
-            KIO::getJobTracker()->registerJob(job);
             connect(job,
                     SIGNAL(infoMessage(KJob*, QString, QString)),
                     SLOT(onInfoMessage(KJob*, QString, QString)));
diff --git a/src/handle-incoming-file-transfer-channel-job.cpp b/src/handle-incoming-file-transfer-channel-job.cpp
index 1b94a77..6912a88 100644
--- a/src/handle-incoming-file-transfer-channel-job.cpp
+++ b/src/handle-incoming-file-transfer-channel-job.cpp
@@ -27,6 +27,8 @@
 #include <KDebug>
 #include <KUrl>
 #include <kio/renamedialog.h>
+#include <kio/global.h>
+#include <kjobtrackerinterface.h>
 
 #include <TelepathyQt4/IncomingFileTransferChannel>
 #include <TelepathyQt4/PendingReady>
@@ -81,6 +83,7 @@ HandleIncomingFileTransferChannelJob::HandleIncomingFileTransferChannelJob(Tp::I
         return;
     }
 
+    KIO::getJobTracker()->registerJob(this);
     setCapabilities(KJob::Killable);
     setTotalAmount(KJob::Bytes, channel->size());
 
diff --git a/src/handle-outgoing-file-transfer-channel-job.cpp b/src/handle-outgoing-file-transfer-channel-job.cpp
index c720dff..05cf7b9 100644
--- a/src/handle-outgoing-file-transfer-channel-job.cpp
+++ b/src/handle-outgoing-file-transfer-channel-job.cpp
@@ -25,6 +25,8 @@
 #include <KLocalizedString>
 #include <KDebug>
 #include <KUrl>
+#include <kio/global.h>
+#include <kjobtrackerinterface.h>
 
 #include <TelepathyQt4/OutgoingFileTransferChannel>
 #include <TelepathyQt4/PendingReady>
@@ -78,6 +80,7 @@ HandleOutgoingFileTransferChannelJob::HandleOutgoingFileTransferChannelJob(Tp::O
             SIGNAL(invalidated(Tp::DBusProxy *, const QString &, const QString &)),
             SLOT(__k__onInvalidated()));
 
+    KIO::getJobTracker()->registerJob(this);
     setCapabilities(KJob::Killable);
     setTotalAmount(KJob::Bytes, channel->size());
 

-- 
ktp-filetransfer-handler packaging