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

The following commit has been merged in the master branch:
commit bf30667bb6711a0f52587aa247a46307c8662fdd
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Tue Nov 26 10:54:36 2013 +0100

    Tidy ChatWindow to use convenience method from KTp::Contact
    
    This avoids using deprecated calls to streamedMedia
    
    Reviewed-By: Akulich Alexandr, Martin Klapetek
---
 app/chat-window.cpp | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/app/chat-window.cpp b/app/chat-window.cpp
index 2e40873..663d37b 100644
--- a/app/chat-window.cpp
+++ b/app/chat-window.cpp
@@ -26,6 +26,7 @@
 
 #include <KTp/service-availability-checker.h>
 #include <KTp/actions.h>
+#include <KTp/contact.h>
 
 #include <KStandardAction>
 #include <KIcon>
@@ -335,17 +336,14 @@ void ChatWindow::onCurrentIndexChanged(int index)
     //always disabled for group chats and offline accounts.
     if (!currentChatTab->isGroupChat() && currentChatTab->account()->connection()) {
         // check which capabilities the contact and user supports
-        Tp::ContactCapabilities contactCapabilites = currentChatTab->textChannel()->targetContact()->capabilities();
-        Tp::ContactCapabilities selfCapabilities = currentChatTab->textChannel()->groupSelfContact()->capabilities();
+        KTp::ContactPtr targetContact = KTp::ContactPtr::qObjectCast(currentChatTab->textChannel()->targetContact());
 
-        setAudioCallEnabled(selfCapabilities.streamedMediaAudioCalls() && contactCapabilites.streamedMediaAudioCalls());
-        setFileTransferEnabled(selfCapabilities.fileTransfers() && contactCapabilites.fileTransfers());
-        setVideoCallEnabled(selfCapabilities.streamedMediaVideoCalls() && contactCapabilites.streamedMediaVideoCalls());
-        setShareDesktopEnabled(s_krfbAvailableChecker->isAvailable() && contactCapabilites.streamTubes(QLatin1String("rfb")));
+        setAudioCallEnabled(targetContact->audioCallCapability());
+        setFileTransferEnabled(targetContact->fileTransferCapability());
+        setVideoCallEnabled(targetContact->videoCallCapability());
+        setShareDesktopEnabled(targetContact->streamTubeServicesCapability().contains(QLatin1String("rfb")));
         setInviteToChatEnabled(true);
-
-        toggleBlockButton(currentChatTab->textChannel()->targetContact()->isBlocked());
-
+        toggleBlockButton(targetContact->isBlocked());
     } else {
         setAudioCallEnabled(false);
         setFileTransferEnabled(false);

-- 
ktp-text-ui packaging