[SCM] ktp-accounts-kcm packaging branch, master, updated. debian/15.12.1-1-1157-gc4589c5

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=ea3187a

The following commit has been merged in the master branch:
commit ea3187a29645269cbe4cfd08e3e3ba46606fdec5
Author: George Goldberg <grundleborg at googlemail.com>
Date:   Mon Aug 3 13:19:48 2009 +0000

    Get accounts ready with all features (I reckon we need all the existing ones at the moment).
    
    svn path=/trunk/playground/network/telepathy-accounts-kcm/; revision=1006319
---
 src/account-item.cpp | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/account-item.cpp b/src/account-item.cpp
index 69ac82f..d514370 100644
--- a/src/account-item.cpp
+++ b/src/account-item.cpp
@@ -54,12 +54,15 @@ AccountItem::AccountItem(const Tp::AccountPtr &account, AccountsListModel *paren
 
     // We should look to see if the "account" instance we are passed is ready
     // yet. If not, we should get it ready now.
-    // FIXME: What features should we check are ready?
-    if (m_account->isReady()) {
+    Tp::Features features;
+    features << Tp::Account::FeatureCore
+             << Tp::Account::FeatureAvatar
+             << Tp::Account::FeatureProtocolInfo;
+
+    if (m_account->isReady(features)) {
         QTimer::singleShot(0, this, SIGNAL(ready()));
     } else {
-        // FIXME: What features should we get ready with?
-        connect(m_account->becomeReady(),
+        connect(m_account->becomeReady(features),
                 SIGNAL(finished(Tp::PendingOperation*)),
                 SLOT(onAccountReady(Tp::PendingOperation*)));
     }

-- 
ktp-accounts-kcm packaging