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

The following commit has been merged in the master branch:
commit dcff541fb040a3a441f298bb110ba33b451822b3
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Fri Mar 23 13:11:26 2012 +0100

    Request Call channels instead of StreamedMedia ones when making calls
    
    Reviewed-by: David Edmundson <kde at davidedmundson.co.uk>
---
 app/chat-window.cpp | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/app/chat-window.cpp b/app/chat-window.cpp
index c7147a9..75dd968 100644
--- a/app/chat-window.cpp
+++ b/app/chat-window.cpp
@@ -595,9 +595,11 @@ void ChatWindow::setShareDesktopEnabled(bool enable)
 
 void ChatWindow::startAudioCall(const Tp::AccountPtr& account, const Tp::ContactPtr& contact)
 {
-    Tp::PendingChannelRequest* channelRequest = account->ensureStreamedMediaAudioCall(contact,
-                                                                                      QDateTime::currentDateTime(),
-                                                                                      QLatin1String(PREFERRED_AUDIO_VIDEO_HANDLER));
+    Tp::PendingChannelRequest *channelRequest = account->ensureAudioCall(contact,
+                                                                         QLatin1String("audio"),
+                                                                         QDateTime::currentDateTime(),
+                                                                         QLatin1String(PREFERRED_AUDIO_VIDEO_HANDLER));
+
     connect(channelRequest, SIGNAL(finished(Tp::PendingOperation*)), this, SLOT(onGenericOperationFinished(Tp::PendingOperation*)));
 }
 
@@ -637,10 +639,11 @@ void ChatWindow::startFileTransfer(const Tp::AccountPtr& account, const Tp::Cont
 
 void ChatWindow::startVideoCall(const Tp::AccountPtr& account, const Tp::ContactPtr& contact)
 {
-    Tp::PendingChannelRequest* channelRequest = account->ensureStreamedMediaVideoCall(contact,
-                                                                                      true,
-                                                                                      QDateTime::currentDateTime(),
-                                                                                      QLatin1String(PREFERRED_AUDIO_VIDEO_HANDLER));
+    Tp::PendingChannelRequest* channelRequest = account->ensureAudioVideoCall(contact,
+                                                                              QLatin1String("audio"),
+                                                                              QLatin1String("video"),
+                                                                              QDateTime::currentDateTime(),
+                                                                              QLatin1String(PREFERRED_AUDIO_VIDEO_HANDLER));
 
     connect(channelRequest, SIGNAL(finished(Tp::PendingOperation*)), this, SLOT(onGenericOperationFinished(Tp::PendingOperation*)));
 }

-- 
ktp-text-ui packaging