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

The following commit has been merged in the master branch:
commit aef6249d6b1ccc2f9b52416536a8d2e4f3771df4
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Fri Aug 9 14:12:01 2013 +0100

    Only fetch RosterGropus in GlobalContactManager if supported
    
    REVIEW: 111965
---
 KTp/global-contact-manager.cpp | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/KTp/global-contact-manager.cpp b/KTp/global-contact-manager.cpp
index f8be0b5..5744799 100644
--- a/KTp/global-contact-manager.cpp
+++ b/KTp/global-contact-manager.cpp
@@ -92,7 +92,16 @@ void GlobalContactManager::onConnectionChanged(const Tp::ConnectionPtr &connecti
     if (connection.isNull()) {
         return;
     }
-    Tp::PendingReady *op = connection->becomeReady(Tp::Features() << Tp::Connection::FeatureRoster << Tp::Connection::FeatureRosterGroups);
+
+    //fetch the roster
+    //only request roster groups if we support it. Otherwise it can error and not finish becoming ready
+    //this is needed to fetch contacts from Salut which do not support groups
+    Tp::Features connectionFeatures;
+    connectionFeatures << Tp::Connection::FeatureRoster;
+    if (connection->hasInterface(TP_QT_IFACE_CHANNEL + QLatin1String(".ContactGroups"))) {
+       connectionFeatures << Tp::Connection::FeatureRosterGroups;
+    }
+    Tp::PendingReady *op = connection->becomeReady(connectionFeatures);
     op->setProperty("connection", QVariant::fromValue<Tp::ConnectionPtr>(connection));
     connect(op, SIGNAL(finished(Tp::PendingOperation*)), SLOT(onConnectionReady(Tp::PendingOperation*)));
 }

-- 
ktp-common-internals packaging