[SCM] ktp-contact-list packaging branch, master, updated. debian/15.12.1-2-1070-g6c56f91

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-contact-list.git;a=commitdiff;h=8352c22

The following commit has been merged in the master branch:
commit 8352c222a094f94499914dcea299e3db83056f38
Author: George Kiagiadakis <george.kiagiadakis at collabora.com>
Date:   Thu Mar 22 22:34:12 2012 +0200

    Request Call channels instead of StreamedMedia ones when making calls.
---
 contact-list-widget.cpp | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/contact-list-widget.cpp b/contact-list-widget.cpp
index 5dc1f17..0a1d434 100644
--- a/contact-list-widget.cpp
+++ b/contact-list-widget.cpp
@@ -384,9 +384,9 @@ void ContactListWidget::startAudioChannel(ContactModelItem *contactItem)
 
     Tp::AccountPtr account = d->model->accountForContactItem(contactItem);
 
-    Tp::PendingChannelRequest *channelRequest = account->ensureStreamedMediaAudioCall(contact,
-                                                                                      QDateTime::currentDateTime(),
-                                                                                      PREFERRED_AUDIO_VIDEO_HANDLER);
+    Tp::PendingChannelRequest *channelRequest = account->ensureAudioCall(contact,
+            QLatin1String("audio"), QDateTime::currentDateTime(), PREFERRED_AUDIO_VIDEO_HANDLER);
+
     connect(channelRequest, SIGNAL(finished(Tp::PendingOperation*)),
             SIGNAL(genericOperationFinished(Tp::PendingOperation*)));
 }
@@ -402,9 +402,10 @@ void ContactListWidget::startVideoChannel(ContactModelItem *contactItem)
 
     Tp::AccountPtr account = d->model->accountForContactItem(contactItem);
 
-    Tp::PendingChannelRequest* channelRequest = account->ensureStreamedMediaVideoCall(contact, true,
-                                                                                      QDateTime::currentDateTime(),
-                                                                                      PREFERRED_AUDIO_VIDEO_HANDLER);
+    Tp::PendingChannelRequest* channelRequest = account->ensureAudioVideoCall(contact,
+            QLatin1String("audio"), QLatin1String("video"),
+            QDateTime::currentDateTime(), PREFERRED_AUDIO_VIDEO_HANDLER);
+
     connect(channelRequest, SIGNAL(finished(Tp::PendingOperation*)),
             SIGNAL(genericOperationFinished(Tp::PendingOperation*)));
 }

-- 
ktp-contact-list packaging