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

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

    Replace Url with Uri
---
 src/handle-incoming-file-transfer-channel-job.cpp | 10 +++++-----
 src/handle-incoming-file-transfer-channel-job.h   |  2 +-
 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 637b127..10dbe43 100644
--- a/src/handle-incoming-file-transfer-channel-job.cpp
+++ b/src/handle-incoming-file-transfer-channel-job.cpp
@@ -45,7 +45,7 @@ class HandleIncomingFileTransferChannelJobPrivate : public KTelepathy::Telepathy
         QFile* file;
 
         void __k__start();
-        void __k__onSetUrlOperationFinished(Tp::PendingOperation* op);
+        void __k__onSetUriOperationFinished(Tp::PendingOperation* op);
         void __k__onFileTransferChannelStateChanged(Tp::FileTransferState state, Tp::FileTransferStateChangeReason reason);
         void __k__onFileTransferChannelTransferredBytesChanged(qulonglong count);
         void __k__onAcceptFileFinished(Tp::PendingOperation* op);
@@ -170,13 +170,13 @@ void HandleIncomingFileTransferChannelJobPrivate::__k__start()
     file = new QFile(url.toLocalFile(), q->parent());
     kDebug() << "Saving file as" << file->fileName();
 
-    Tp::PendingOperation* setUrlOperation = channel->setUri(url.url());
-    q->connect(setUrlOperation,
+    Tp::PendingOperation* setUriOperation = channel->setUri(url.url());
+    q->connect(setUriOperation,
                SIGNAL(finished(Tp::PendingOperation*)),
-               SLOT(__k__onSetUrlOperationFinished(Tp::PendingOperation*)));
+               SLOT(__k__onSetUriOperationFinished(Tp::PendingOperation*)));
 }
 
-void HandleIncomingFileTransferChannelJobPrivate::__k__onSetUrlOperationFinished(Tp::PendingOperation* op)
+void HandleIncomingFileTransferChannelJobPrivate::__k__onSetUriOperationFinished(Tp::PendingOperation* op)
 {
     kDebug();
     Q_Q(HandleIncomingFileTransferChannelJob);
diff --git a/src/handle-incoming-file-transfer-channel-job.h b/src/handle-incoming-file-transfer-channel-job.h
index 442f740..eac51dd 100644
--- a/src/handle-incoming-file-transfer-channel-job.h
+++ b/src/handle-incoming-file-transfer-channel-job.h
@@ -38,7 +38,7 @@ class HandleIncomingFileTransferChannelJob : public KTelepathy::TelepathyBaseJob
 
 //     // Our Q_PRIVATE_SLOTS who perform the real job
     Q_PRIVATE_SLOT(d_func(), void __k__start())
-    Q_PRIVATE_SLOT(d_func(), void __k__onSetUrlOperationFinished(Tp::PendingOperation* op))
+    Q_PRIVATE_SLOT(d_func(), void __k__onSetUriOperationFinished(Tp::PendingOperation* op))
     Q_PRIVATE_SLOT(d_func(), void __k__onFileTransferChannelStateChanged(Tp::FileTransferState state, Tp::FileTransferStateChangeReason reason))
     Q_PRIVATE_SLOT(d_func(), void __k__onFileTransferChannelTransferredBytesChanged(qulonglong count))
     Q_PRIVATE_SLOT(d_func(), void __k__onAcceptFileFinished(Tp::PendingOperation* op))

-- 
ktp-filetransfer-handler packaging