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

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

    Fix processed amount
---
 src/handle-incoming-file-transfer-channel-job.cpp | 6 +++---
 src/handle-outgoing-file-transfer-channel-job.cpp | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/handle-incoming-file-transfer-channel-job.cpp b/src/handle-incoming-file-transfer-channel-job.cpp
index 2fef344..96cbab7 100644
--- a/src/handle-incoming-file-transfer-channel-job.cpp
+++ b/src/handle-incoming-file-transfer-channel-job.cpp
@@ -443,9 +443,9 @@ void HandleIncomingFileTransferChannelJobPrivate::__k__onFileTransferChannelTran
     Q_Q(HandleIncomingFileTransferChannelJob);
 
     kDebug().nospace() << "Receiving " << channel->fileName() << " - "
-                       << "transferred bytes" << " = " << count << " ("
-                       << ((int) (((double) count / channel->size()) * 100)) << "% done)";
-    q->setProcessedAmount(KJob::Bytes, count);
+                       << "transferred bytes" << " = " << offset + count << " ("
+                       << ((int) (((double) (offset + count) / channel->size()) * 100)) << "% done)";
+    q->setProcessedAmount(KJob::Bytes, offset + count);
 }
 
 void HandleIncomingFileTransferChannelJobPrivate::__k__onAcceptFileFinished(Tp::PendingOperation* op)
diff --git a/src/handle-outgoing-file-transfer-channel-job.cpp b/src/handle-outgoing-file-transfer-channel-job.cpp
index b8f1e9d..211fa54 100644
--- a/src/handle-outgoing-file-transfer-channel-job.cpp
+++ b/src/handle-outgoing-file-transfer-channel-job.cpp
@@ -270,9 +270,9 @@ void HandleOutgoingFileTransferChannelJobPrivate::__k__onFileTransferChannelTran
     Q_Q(HandleOutgoingFileTransferChannelJob);
 
     kDebug().nospace() << "Sending " << channel->fileName() << " - "
-                       << "Transferred bytes = " << count << " ("
-                       << ((int) (((double) count / channel->size()) * 100)) << "% done)";
-    q->setProcessedAmount(KJob::Bytes, count);
+                       << "Transferred bytes = " << offset + count << " ("
+                       << ((int) (((double) (offset + count) / channel->size()) * 100)) << "% done)";
+    q->setProcessedAmount(KJob::Bytes, offset + count);
 }
 
 void HandleOutgoingFileTransferChannelJobPrivate::__k__onProvideFileFinished(Tp::PendingOperation* op)

-- 
ktp-filetransfer-handler packaging