[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=9a19f60

The following commit has been merged in the master branch:
commit 9a19f604e9fe67a68b078f9f62272ea34b026278
Author: Aleix Pol <aleixpol at kde.org>
Date:   Tue Nov 25 12:49:31 2014 +0100

    Ensure we're not calling allKnownContacts too early
    
    Also remove "couldn't find a contact" warning. It's acceptable for the model
    to be shown before telepathy is running.
    
    REVIEW: 121232
---
 KTp/global-contact-manager.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/KTp/global-contact-manager.cpp b/KTp/global-contact-manager.cpp
index 07e93f6..80285dc 100644
--- a/KTp/global-contact-manager.cpp
+++ b/KTp/global-contact-manager.cpp
@@ -197,7 +197,7 @@ KTp::ContactPtr GlobalContactManager::contactForContactId(const QString &account
         qWarning() << "account not found" << accountPath;
     }
 
-    if (account && account->connection() && account->connection()->contactManager()) {
+    if (account && account->connection() && account->connection()->contactManager() && account->connection()->isReady(Tp::Connection::FeatureRoster)) {
         Tp::Contacts contactSet = account->connection()->contactManager()->allKnownContacts();
         Q_FOREACH (const Tp::ContactPtr &contact, contactSet) {
             if (contact->id() == contactId) {
@@ -205,7 +205,7 @@ KTp::ContactPtr GlobalContactManager::contactForContactId(const QString &account
             }
         }
     }
-    qWarning() << "Couldn't find a contact for" << contactId;
+//     qDebug() << "Couldn't find a contact for" << contactId;
 
     return KTp::ContactPtr();
 }

-- 
ktp-common-internals packaging