[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=5e082bf

The following commit has been merged in the master branch:
commit 5e082bf2c955187baba9968e36044ff41d4e526e
Author: Dario Freddi <dario.freddi at collabora.co.uk>
Date:   Fri Apr 22 15:10:26 2011 +0200

    Don't rely on sender() exclusively, as we're calling onContactManagerStateChanged also from a standard method call
---
 main-widget.cpp | 10 +++++++---
 main-widget.h   |  3 ++-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/main-widget.cpp b/main-widget.cpp
index 498d01c..3d264cb 100644
--- a/main-widget.cpp
+++ b/main-widget.cpp
@@ -343,14 +343,18 @@ void MainWidget::monitorPresence(const Tp::AccountPtr &account)
     connect(account->connection()->contactManager().data(),
             SIGNAL(stateChanged(Tp::ContactListState)),
             this, SLOT(onContactManagerStateChanged(Tp::ContactListState)));
-    onContactManagerStateChanged(account->connection()->contactManager()->state());
+    onContactManagerStateChanged(account->connection()->contactManager(),
+                                 account->connection()->contactManager()->state());
 }
 
 void MainWidget::onContactManagerStateChanged(Tp::ContactListState state)
 {
-    if (state == Tp::ContactListStateSuccess) {
-        Tp::ContactManagerPtr contactManager(qobject_cast< Tp::ContactManager* >(sender()));
+    onContactManagerStateChanged(Tp::ContactManagerPtr(qobject_cast< Tp::ContactManager* >(sender())), state);
+}
 
+void MainWidget::onContactManagerStateChanged(const Tp::ContactManagerPtr &contactManager, Tp::ContactListState state)
+{
+    if (state == Tp::ContactListStateSuccess) {
         QFutureWatcher< Tp::ContactPtr > watcher;
         connect(&watcher, SIGNAL(finished()), this, SLOT(onAccountsPresenceStatusFiltered()));
         watcher.setFuture(QtConcurrent::filtered(contactManager->allKnownContacts(),
diff --git a/main-widget.h b/main-widget.h
index a63045f..3898a92 100644
--- a/main-widget.h
+++ b/main-widget.h
@@ -100,7 +100,8 @@ private Q_SLOTS:
     void onAccountsPresenceStatusFiltered();
     void onPresencePublicationRequested(const Tp::Contacts &contacts);
     void monitorPresence(const Tp::AccountPtr &account);
-    void onContactManagerStateChanged(Tp::ContactListState);
+    void onContactManagerStateChanged(Tp::ContactListState state);
+    void onContactManagerStateChanged(const Tp::ContactManagerPtr &contactManager, Tp::ContactListState state);
 
 private:
     AccountsModel          *m_model;

-- 
ktp-contact-list packaging