[SCM] ktp-text-ui packaging branch, master, updated. debian/15.12.1-1-1918-gdf4b0ec

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=7fc4262

The following commit has been merged in the master branch:
commit 7fc4262cc491b7cf6d93438add4eb42da6561592
Author: Dan Vrátil <dvratil at redhat.com>
Date:   Wed Nov 21 16:57:03 2012 +0100

    Port to KTp::Actions
    
    REVIEW: 107402
---
 app/chat-window.cpp | 36 +++++-------------------------------
 lib/chat-widget.cpp | 15 +++------------
 2 files changed, 8 insertions(+), 43 deletions(-)

diff --git a/app/chat-window.cpp b/app/chat-window.cpp
index 00ee85b..0423d70 100644
--- a/app/chat-window.cpp
+++ b/app/chat-window.cpp
@@ -25,6 +25,7 @@
 #include "chat-widget.h"
 
 #include <KTp/service-availability-checker.h>
+#include <KTp/actions.h>
 
 #include <KStandardAction>
 #include <KIcon>
@@ -58,9 +59,6 @@
 
 #include "invite-contact-dialog.h"
 
-#define PREFERRED_TEXTCHAT_HANDLER "org.freedesktop.Telepathy.Client.KTp.TextUi"
-#define PREFERRED_FILETRANSFER_HANDLER "org.freedesktop.Telepathy.Client.KTp.FileTransfer"
-#define PREFERRED_AUDIO_VIDEO_HANDLER "org.freedesktop.Telepathy.Client.KTp.CallUi"
 #define PREFERRED_RFB_HANDLER "org.freedesktop.Telepathy.Client.krfb_rfb_handler"
 
 K_GLOBAL_STATIC_WITH_ARGS(KTp::ServiceAvailabilityChecker, s_krfbAvailableChecker,
@@ -709,11 +707,7 @@ void ChatWindow::updateAccountIcon()
 
 void ChatWindow::startAudioCall(const Tp::AccountPtr& account, const Tp::ContactPtr& contact)
 {
-    Tp::PendingChannelRequest *channelRequest = account->ensureAudioCall(contact,
-                                                                         QLatin1String("audio"),
-                                                                         QDateTime::currentDateTime(),
-                                                                         QLatin1String(PREFERRED_AUDIO_VIDEO_HANDLER));
-
+    Tp::PendingChannelRequest *channelRequest = KTp::Actions::startAudioCall(account, contact);
     connect(channelRequest, SIGNAL(finished(Tp::PendingOperation*)), this, SLOT(onGenericOperationFinished(Tp::PendingOperation*)));
 }
 
@@ -735,40 +729,20 @@ void ChatWindow::startFileTransfer(const Tp::AccountPtr& account, const Tp::Cont
 
     QDateTime now = QDateTime::currentDateTime();
     Q_FOREACH(const QString& fileName, fileNames) {
-        QFileInfo fileinfo(fileName);
-
-        kDebug() << "Filename:" << fileName;
-        kDebug() << "Content type:" << KMimeType::findByFileContent(fileName)->name();
-
-        Tp::FileTransferChannelCreationProperties fileTransferProperties(fileName, KMimeType::findByFileContent(fileName)->name());
-
-        Tp::PendingChannelRequest* channelRequest = account->createFileTransfer(contact,
-                                                                                fileTransferProperties,
-                                                                                QDateTime::currentDateTime(),
-                                                                                QLatin1String(PREFERRED_FILETRANSFER_HANDLER));
-
+        Tp::PendingChannelRequest* channelRequest = KTp::Actions::startFileTransfer(account, contact, fileName);
         connect(channelRequest, SIGNAL(finished(Tp::PendingOperation*)), SLOT(onGenericOperationFinished(Tp::PendingOperation*)));
     }
 }
 
 void ChatWindow::startVideoCall(const Tp::AccountPtr& account, const Tp::ContactPtr& contact)
 {
-    Tp::PendingChannelRequest* channelRequest = account->ensureAudioVideoCall(contact,
-                                                                              QLatin1String("audio"),
-                                                                              QLatin1String("video"),
-                                                                              QDateTime::currentDateTime(),
-                                                                              QLatin1String(PREFERRED_AUDIO_VIDEO_HANDLER));
-
+    Tp::PendingChannelRequest* channelRequest = KTp::Actions::startAudioVideoCall(account, contact);
     connect(channelRequest, SIGNAL(finished(Tp::PendingOperation*)), this, SLOT(onGenericOperationFinished(Tp::PendingOperation*)));
 }
 
 void ChatWindow::startShareDesktop(const Tp::AccountPtr& account, const Tp::ContactPtr& contact)
 {
-    Tp::PendingChannelRequest* channelRequest = account->createStreamTube(contact,
-                                                                          QLatin1String("rfb"),
-                                                                          QDateTime::currentDateTime(),
-                                                                          QLatin1String(PREFERRED_RFB_HANDLER));
-
+    Tp::PendingChannelRequest* channelRequest = KTp::Actions::startDesktopSharing(account, contact);
     connect(channelRequest, SIGNAL(finished(Tp::PendingOperation*)), this, SLOT(onGenericOperationFinished(Tp::PendingOperation*)));
 }
 
diff --git a/lib/chat-widget.cpp b/lib/chat-widget.cpp
index 6aad927..fffaac4 100644
--- a/lib/chat-widget.cpp
+++ b/lib/chat-widget.cpp
@@ -50,6 +50,7 @@
 #include <TelepathyQt/OutgoingFileTransferChannel>
 
 #include <KTp/presence.h>
+#include <KTp/actions.h>
 #include "message-processor.h"
 
 class ChatWidgetPrivate
@@ -342,12 +343,7 @@ void ChatWidget::dropEvent(QDropEvent *e)
     if (data->hasUrls()) {
         Q_FOREACH(const QUrl &url, data->urls()) {
             if (url.isLocalFile()) {
-                Tp::FileTransferChannelCreationProperties properties(
-                        url.toLocalFile(),
-                        KMimeType::findByFileContent(url.toLocalFile())->name());
-                d->account->createFileTransfer(d->channel->targetContact(),
-                        properties, QDateTime::currentDateTime(),
-                        QLatin1String("org.freedesktop.Telepathy.Client.KTp.FileTransfer"));
+		KTp::Actions::startFileTransfer(d->account, d->channel->targetContact(), url.toLocalFile());
             } else {
                 d->ui.sendMessageBox->append(url.toString());
             }
@@ -375,13 +371,8 @@ void ChatWidget::dropEvent(QDropEvent *e)
             return;
         }
 
-        Tp::FileTransferChannelCreationProperties properties(
-                    tmpFile.fileName(),
-                    KMimeType::findByFileContent(tmpFile.fileName())->name());
         Tp::PendingChannelRequest *request;
-        request = d->account->createFileTransfer(d->channel->targetContact(),
-                        properties, QDateTime::currentDateTime(),
-                        QLatin1String("org.freedesktop.Telepathy.Client.KTp.FileTransfer"));
+	request = KTp::Actions::startFileTransfer(d->account, d->channel->targetContact(), tmpFile.fileName());
         connect(request, SIGNAL(finished(Tp::PendingOperation*)),
                 this, SLOT(temporaryFileTransferChannelCreated(Tp::PendingOperation*)));
 

-- 
ktp-text-ui packaging