[SCM] ktp-contact-runner packaging branch, master, updated. debian/15.12.1-2-244-g38a1f58

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-contact-runner.git;a=commitdiff;h=2d50245

The following commit has been merged in the master branch:
commit 2d50245a89d92c5bc480afb9be88c26b8f94d719
Author: Dan Vrátil <dvratil at redhat.com>
Date:   Mon Mar 25 10:13:56 2013 +0100

    Use KTp::Contact to determine contact's capabilities in krunner actions
    
    KRunner now shows "Start audio call" and "Start video call"
    actions when contact has such capabilities.
    
    REVIEW: 109698
    BUG: 317118
    FIXED-IN: 0.6.0
---
 src/contactrunner.cpp | 28 ++++++++++++----------------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/src/contactrunner.cpp b/src/contactrunner.cpp
index abbc3f4..2ee63ae 100644
--- a/src/contactrunner.cpp
+++ b/src/contactrunner.cpp
@@ -153,9 +153,7 @@ QList< QAction* > ContactRunner::actionsForMatch(const Plasma::QueryMatch &match
         return actions;
     }
 
-    Tp::ContactCapabilities capabilities = data.contact->capabilities();
-
-    if (capabilities.textChats()) {
+    if (hasCapability(data.contact, ContactRunner::TextChatCapability)) {
         actions.append(action(QLatin1String("start-text-chat")));
 
         if (!m_loggerDisabled) {
@@ -163,19 +161,19 @@ QList< QAction* > ContactRunner::actionsForMatch(const Plasma::QueryMatch &match
         }
     }
 
-    if (capabilities.audioCalls()) {
+    if (hasCapability(data.contact, ContactRunner::AudioCallCapability)) {
         actions.append(action(QLatin1String("start-audio-call")));
     }
 
-    if (capabilities.videoCallsWithAudio()) {
+    if (hasCapability(data.contact, ContactRunner::VideoCallCapability)) {
         actions.append(action(QLatin1String("start-video-call")));
     }
 
-    if (capabilities.fileTransfers()) {
+    if (hasCapability(data.contact, ContactRunner::FileTransferCapability)) {
         actions.append(action(QLatin1String("start-file-transfer")));
     }
 
-    if (capabilities.streamTubes(QLatin1String("rfb"))) {
+    if (hasCapability(data.contact, ContactRunner::DesktopSharingCapability)) {
         actions.append(action(QLatin1String("start-desktop-sharing")));
     }
 
@@ -222,7 +220,7 @@ void ContactRunner::run(const Plasma::RunnerContext &context, const Plasma::Quer
         return;
     }
 
-    /* Open chat/call/whaterver with contact */
+    /* Open chat/call/whatever with contact */
     Tp::AccountPtr account = data.account;
     Tp::ContactPtr contact = data.contact;
 
@@ -261,23 +259,21 @@ bool ContactRunner::hasCapability(const Tp::ContactPtr &contact, Capability capa
         return true;
     }
 
-    if ((capability == TextChatCapability) &&
-        contact->capabilities().textChats()) {
+    if ((capability == TextChatCapability) && contact->capabilities().textChats()) {
         return true;
     }
 
-    if ((capability == AudioCallCapability) &&
-        contact->capabilities().audioCalls()) {
+    const KTp::ContactPtr ktpContact = KTp::ContactPtr::dynamicCast(contact);
+
+    if ((capability == AudioCallCapability) && ktpContact->audioCallCapability()) {
         return true;
     }
 
-    if ((capability == VideoCallCapability) &&
-        contact->capabilities().videoCalls()) {
+    if ((capability == VideoCallCapability) && ktpContact->videoCallCapability()) {
         return true;
     }
 
-    if ((capability == FileTransferCapability) &&
-        contact->capabilities().fileTransfers()) {
+    if ((capability == FileTransferCapability) && ktpContact->fileTransferCapability()) {
         return true;
     }
 

-- 
ktp-contact-runner packaging