[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=3c0ad6e

The following commit has been merged in the master branch:
commit 3c0ad6e793293272db909c084d3592454cdb30fe
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Fri Feb 8 00:45:19 2013 +0000

    Make GlobalContactManager work with an un-ready AccountManager
    
    REVIEW: 108692
---
 KTp/global-contact-manager.cpp | 20 +++++++++++++++-----
 KTp/global-contact-manager.h   |  1 +
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/KTp/global-contact-manager.cpp b/KTp/global-contact-manager.cpp
index 1f55d13..2210e64 100644
--- a/KTp/global-contact-manager.cpp
+++ b/KTp/global-contact-manager.cpp
@@ -23,6 +23,7 @@
 #include <TelepathyQt/AccountManager>
 #include <TelepathyQt/Account>
 #include <TelepathyQt/ContactManager>
+#include <TelepathyQt/PendingReady>
 
 #include <KDebug>
 
@@ -41,11 +42,7 @@ GlobalContactManager::GlobalContactManager(const Tp::AccountManagerPtr &accountM
     d(new GlobalContactManagerPrivate())
 {
     d->accountManager = accountManager;
-
-    Q_FOREACH(const Tp::AccountPtr &account, accountManager->allAccounts()) {
-        onNewAccount(account);
-    }
-    connect(accountManager.data(), SIGNAL(newAccount(Tp::AccountPtr)), SLOT(onNewAccount(Tp::AccountPtr)));
+    connect(d->accountManager->becomeReady(), SIGNAL(finished(Tp::PendingOperation*)), SLOT(onAccountManagerReady(Tp::PendingOperation*)));
 }
 
 GlobalContactManager::~GlobalContactManager()
@@ -68,6 +65,19 @@ Tp::Contacts GlobalContactManager::allKnownContacts() const
     return allContacts;
 }
 
+void GlobalContactManager::onAccountManagerReady(Tp::PendingOperation *op)
+{
+    if (op->isError()) {
+        kWarning() << "Account Manager becomeReady failed";
+    }
+
+    Q_FOREACH(const Tp::AccountPtr &account, d->accountManager->allAccounts()) {
+        onNewAccount(account);
+    }
+    connect(d->accountManager.data(), SIGNAL(newAccount(Tp::AccountPtr)), SLOT(onNewAccount(Tp::AccountPtr)));
+
+}
+
 void GlobalContactManager::onNewAccount(const Tp::AccountPtr &account)
 {
     onConnectionChanged(account->connection());
diff --git a/KTp/global-contact-manager.h b/KTp/global-contact-manager.h
index 889d45e..22ddecb 100644
--- a/KTp/global-contact-manager.h
+++ b/KTp/global-contact-manager.h
@@ -48,6 +48,7 @@ Q_SIGNALS:
     void presencePublicationRequested(const Tp::Contacts);
 
 private Q_SLOTS:
+    void onAccountManagerReady(Tp::PendingOperation *op);
     void onNewAccount(const Tp::AccountPtr &account);
     void onConnectionChanged(const Tp::ConnectionPtr &connection);
     void onContactManagerStateChanged(Tp::ContactListState state);

-- 
ktp-common-internals packaging