[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=eeab76e

The following commit has been merged in the master branch:
commit eeab76e7c4182b29067b21e7ada5520b47d1f978
Author: Aleix Pol <aleixpol at kde.org>
Date:   Wed Mar 6 15:47:21 2013 +0100

    Declarative Plugin: Overload file sending for url's
    
    Let the module understand URL's as well. Otherwise it was translated into
    a string and telepathy wouldn't understand the file:// thing.
    
    Also this opens the possibility of implementing KIO properly, eventually.
    
    REVIEW: 109307
---
 KTp/Declarative/declarative-ktp-actions.cpp |  5 +++++
 KTp/Declarative/declarative-ktp-actions.h   |  4 ++++
 KTp/actions.cpp                             | 15 +++++++++++++++
 KTp/actions.h                               |  5 +++++
 4 files changed, 29 insertions(+)

diff --git a/KTp/Declarative/declarative-ktp-actions.cpp b/KTp/Declarative/declarative-ktp-actions.cpp
index 4e8eeee..53763b3 100644
--- a/KTp/Declarative/declarative-ktp-actions.cpp
+++ b/KTp/Declarative/declarative-ktp-actions.cpp
@@ -48,3 +48,8 @@ Tp::PendingChannelRequest* DeclarativeKTpActions::startFileTransfer(const Tp::Ac
 {
     return KTp::Actions::startFileTransfer(account, contact, filePath);
 }
+
+Tp::PendingOperation* DeclarativeKTpActions::startFileTransfer(const Tp::AccountPtr& account, const KTp::ContactPtr& contact, const QUrl& url)
+{
+    return KTp::Actions::startFileTransfer(account, contact, url);
+}
diff --git a/KTp/Declarative/declarative-ktp-actions.h b/KTp/Declarative/declarative-ktp-actions.h
index 034bcd2..8e8d877 100644
--- a/KTp/Declarative/declarative-ktp-actions.h
+++ b/KTp/Declarative/declarative-ktp-actions.h
@@ -42,6 +42,10 @@ class DeclarativeKTpActions : public QObject
         Tp::PendingChannelRequest* startDesktopSharing(const Tp::AccountPtr &account,
                                                                 const KTp::ContactPtr &contact);
 
+        Tp::PendingOperation* startFileTransfer(const Tp::AccountPtr& account,
+                                                const KTp::ContactPtr& contact,
+                                                const QUrl& url);
+
         Tp::PendingChannelRequest* startFileTransfer(const Tp::AccountPtr &account,
                                                                 const KTp::ContactPtr &contact,
                                                                 const QString &filePath);
diff --git a/KTp/actions.cpp b/KTp/actions.cpp
index 2e2ae5e..0745573 100644
--- a/KTp/actions.cpp
+++ b/KTp/actions.cpp
@@ -22,10 +22,12 @@
 #include <TelepathyQt/ChannelRequestHints>
 #include <TelepathyQt/Contact>
 #include <TelepathyQt/PendingChannelRequest>
+#include <TelepathyQt/PendingFailure>
 
 #include <KMimeType>
 #include <KToolInvocation>
 #include <KDebug>
+#include <KLocalizedString>
 
 #define PREFERRED_TEXT_CHAT_HANDLER QLatin1String("org.freedesktop.Telepathy.Client.KTp.TextUi")
 #define PREFERRED_FILE_TRANSFER_HANDLER QLatin1String("org.freedesktop.Telepathy.Client.KTp.FileTransfer")
@@ -122,6 +124,19 @@ Tp::PendingChannelRequest* Actions::startFileTransfer(const Tp::AccountPtr& acco
                                        PREFERRED_FILE_TRANSFER_HANDLER);
 }
 
+Tp::PendingOperation* Actions::startFileTransfer(const Tp::AccountPtr& account,
+                                                 const Tp::ContactPtr& contact,
+                                                 const QUrl& url)
+{
+    Tp::PendingOperation *ret = 0;
+    if (url.isLocalFile()) {
+        ret = startFileTransfer(account, contact, url.toLocalFile());
+    } else {
+        ret = new Tp::PendingFailure(QLatin1String("Failed file transfer"), QString(QLatin1String("You are only supposed to send local files, not %1")).arg(url.toString()), account);
+    }
+    return ret;
+}
+
 void Actions::openLogViewer(const Tp::AccountPtr& account,
                             const Tp::ContactPtr& contact)
 {
diff --git a/KTp/actions.h b/KTp/actions.h
index d825bae..7efc99f 100644
--- a/KTp/actions.h
+++ b/KTp/actions.h
@@ -25,6 +25,7 @@
 
 namespace Tp {
 class PendingChannelRequest;
+class PendingOperation;
 }
 
 namespace KTp {
@@ -48,6 +49,10 @@ namespace Actions {
                                                             const Tp::ContactPtr &contact,
                                                             const QString &filePath);
 
+    KTP_EXPORT Tp::PendingOperation* startFileTransfer(const Tp::AccountPtr &account,
+                                                       const Tp::ContactPtr &contact,
+                                                       const QUrl &url);
+
     KTP_EXPORT void openLogViewer(const Tp::AccountPtr &account,
                                   const Tp::ContactPtr &contact);
 

-- 
ktp-common-internals packaging