[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=6dfc930

The following commit has been merged in the master branch:
commit 6dfc93047e39fdf042abf2caccf998dcee35a08a
Author: George Kiagiadakis <george.kiagiadakis at collabora.com>
Date:   Mon Sep 19 20:45:50 2011 +0300

    Add a new class to watch for the availability of krfb.
    
    This is because the self contact capabilities do not advertise
    the availability of krfb; they only advertise the availability of krdc.
---
 models/contact-model-item.cpp | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/models/contact-model-item.cpp b/models/contact-model-item.cpp
index b35d69e..d453956 100644
--- a/models/contact-model-item.cpp
+++ b/models/contact-model-item.cpp
@@ -21,15 +21,23 @@
  */
 
 #include "contact-model-item.h"
+#include "accounts-model.h"
+#include "../service-availability-checker.h"
 
 #include <QImage>
 
+#include <KGlobal>
+
 #include <TelepathyQt4/AvatarData>
 #include <TelepathyQt4/ContactCapabilities>
 #include <TelepathyQt4/ContactManager>
 #include <TelepathyQt4/RequestableChannelClassSpec>
 
-#include "accounts-model.h"
+
+
+K_GLOBAL_STATIC_WITH_ARGS(ServiceAvailabilityChecker, s_krfbAvailableChecker,
+                          (QLatin1String("org.freedesktop.Telepathy.Client.krfb_rfb_handler")));
+
 
 struct ContactModelItem::Private
 {
@@ -44,6 +52,7 @@ struct ContactModelItem::Private
 ContactModelItem::ContactModelItem(const Tp::ContactPtr &contact)
     : mPriv(new Private(contact))
 {
+    (void) s_krfbAvailableChecker.operator->(); //start the d-bus query the first time this is called
 
     connect(contact.data(),
             SIGNAL(aliasChanged(QString)),
@@ -198,7 +207,7 @@ bool ContactModelItem::fileTransferCapability() const
 bool ContactModelItem::desktopSharingCapability() const
 {
     bool contactCanHandleRfb = mPriv->mContact->capabilities().streamTubes("rfb");
-    bool selfCanHandleRfb = mPriv->mContact->manager()->connection()->selfContact()->capabilities().streamTubes("rfb");
+    bool selfCanHandleRfb = s_krfbAvailableChecker->isAvailable();
     return contactCanHandleRfb && selfCanHandleRfb;
 }
 

-- 
ktp-common-internals packaging