[SCM] ktp-contact-list packaging branch, master, updated. debian/15.12.1-2-1070-g6c56f91

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-contact-list.git;a=commitdiff;h=c0e12b7

The following commit has been merged in the master branch:
commit c0e12b745d8cfe9f9091b7c2c95b4bbba9aab989
Author: Dario Freddi <dario.freddi at collabora.co.uk>
Date:   Fri Apr 22 12:36:36 2011 +0200

    Make sure the contact manager is ready before listing contacts
---
 main-widget.cpp | 22 +++++++++++++++++-----
 main-widget.h   |  1 +
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/main-widget.cpp b/main-widget.cpp
index 4144791..498d01c 100644
--- a/main-widget.cpp
+++ b/main-widget.cpp
@@ -340,12 +340,24 @@ void MainWidget::monitorPresence(const Tp::AccountPtr &account)
     connect(account->connection()->contactManager().data(), SIGNAL(presencePublicationRequested(Tp::Contacts)),
             this, SLOT(onPresencePublicationRequested(Tp::Contacts)));
 
-    QFutureWatcher< Tp::ContactPtr > watcher;
-    connect(&watcher, SIGNAL(finished()), this, SLOT(onAccountsPresenceStatusFiltered()));
-    watcher.setFuture(QtConcurrent::filtered(account->connection()->contactManager()->allKnownContacts(),
-                                             kde_tp_filter_contacts_by_publication_status));
+    connect(account->connection()->contactManager().data(),
+            SIGNAL(stateChanged(Tp::ContactListState)),
+            this, SLOT(onContactManagerStateChanged(Tp::ContactListState)));
+    onContactManagerStateChanged(account->connection()->contactManager()->state());
+}
+
+void MainWidget::onContactManagerStateChanged(Tp::ContactListState state)
+{
+    if (state == Tp::ContactListStateSuccess) {
+        Tp::ContactManagerPtr contactManager(qobject_cast< Tp::ContactManager* >(sender()));
 
-    kDebug() << "Watcher is on";
+        QFutureWatcher< Tp::ContactPtr > watcher;
+        connect(&watcher, SIGNAL(finished()), this, SLOT(onAccountsPresenceStatusFiltered()));
+        watcher.setFuture(QtConcurrent::filtered(contactManager->allKnownContacts(),
+                                                 kde_tp_filter_contacts_by_publication_status));
+
+        kDebug() << "Watcher is on";
+    }
 }
 
 void MainWidget::onAccountStateChanged(bool enabled)
diff --git a/main-widget.h b/main-widget.h
index b83a8aa..a63045f 100644
--- a/main-widget.h
+++ b/main-widget.h
@@ -100,6 +100,7 @@ private Q_SLOTS:
     void onAccountsPresenceStatusFiltered();
     void onPresencePublicationRequested(const Tp::Contacts &contacts);
     void monitorPresence(const Tp::AccountPtr &account);
+    void onContactManagerStateChanged(Tp::ContactListState);
 
 private:
     AccountsModel          *m_model;

-- 
ktp-contact-list packaging