[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=408cfa1

The following commit has been merged in the master branch:
commit 408cfa10d23ddc555c4024c3929c05152846873b
Author: George Kiagiadakis <kiagiadakis.george at gmail.com>
Date:   Wed Jul 11 12:47:42 2012 +0300

    ContactModelItem: Replace StreamedMedia method calls with the equivalent Call1 ones
---
 KTp/Models/contact-model-item.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/KTp/Models/contact-model-item.cpp b/KTp/Models/contact-model-item.cpp
index 6778504..6f4fe0b 100644
--- a/KTp/Models/contact-model-item.cpp
+++ b/KTp/Models/contact-model-item.cpp
@@ -136,13 +136,13 @@ QVariant ContactModelItem::data(int role) const
     case AccountsModel::TextChatCapabilityRole:
         return mPriv->mContact->capabilities().textChats();
     case AccountsModel::MediaCallCapabilityRole:
-        return mPriv->mContact->capabilities().streamedMediaCalls();
+        return audioCallCapability() || videoCallCapability();
     case AccountsModel::AudioCallCapabilityRole:
         return audioCallCapability();
     case AccountsModel::VideoCallCapabilityRole:
         return videoCallCapability();
     case AccountsModel::UpgradeCallCapabilityRole:
-        return mPriv->mContact->capabilities().upgradingStreamedMediaCalls();
+        return mPriv->mContact->capabilities().upgradingCalls();
     case AccountsModel::FileTransferCapabilityRole:
         return fileTransferCapability();
     case AccountsModel::DesktopSharingCapabilityRole:
@@ -201,8 +201,8 @@ Tp::ContactPtr ContactModelItem::contact() const
 bool ContactModelItem::audioCallCapability() const
 {
     if (mPriv->mContact->manager()->connection()) {
-        bool contactCanStreamAudio = mPriv->mContact->capabilities().streamedMediaAudioCalls();
-        bool selfCanStreamAudio = mPriv->mContact->manager()->connection()->selfContact()->capabilities().streamedMediaAudioCalls();
+        bool contactCanStreamAudio = mPriv->mContact->capabilities().audioCalls();
+        bool selfCanStreamAudio = mPriv->mContact->manager()->connection()->selfContact()->capabilities().audioCalls();
         return contactCanStreamAudio && selfCanStreamAudio;
     }
 
@@ -212,8 +212,8 @@ bool ContactModelItem::audioCallCapability() const
 bool ContactModelItem::videoCallCapability() const
 {
     if (mPriv->mContact->manager()->connection()) {
-        bool contactCanStreamVideo = mPriv->mContact->capabilities().streamedMediaVideoCalls();
-        bool selfCanStreamVideo = mPriv->mContact->manager()->connection()->selfContact()->capabilities().streamedMediaVideoCalls();
+        bool contactCanStreamVideo = mPriv->mContact->capabilities().videoCalls();
+        bool selfCanStreamVideo = mPriv->mContact->manager()->connection()->selfContact()->capabilities().videoCalls();
         return contactCanStreamVideo && selfCanStreamVideo;
     }
 

-- 
ktp-common-internals packaging