[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=c0161f3

The following commit has been merged in the master branch:
commit c0161f31ed08e5353c6b9ce48c2857271287b27e
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Fri Apr 22 15:43:42 2011 +0200

    Fix a (yet another) messed up commit of mine
---
 main-widget.cpp | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/main-widget.cpp b/main-widget.cpp
index 88895e5..2c034f3 100644
--- a/main-widget.cpp
+++ b/main-widget.cpp
@@ -363,15 +363,12 @@ void MainWidget::onContactManagerStateChanged(Tp::ContactListState state)
     if (state == Tp::ContactListStateSuccess) {
         Tp::ContactManagerPtr contactManager(qobject_cast< Tp::ContactManager* >(sender()));
 
-        if (contactManager) {
+        QFutureWatcher< Tp::ContactPtr > watcher;
+        connect(&watcher, SIGNAL(finished()), this, SLOT(onAccountsPresenceStatusFiltered()));
+        watcher.setFuture(QtConcurrent::filtered(contactManager->allKnownContacts(),
+                                                kde_tp_filter_contacts_by_publication_status));
 
-            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";
-        }
+        kDebug() << "Watcher is on";
     }
 }
 

-- 
ktp-contact-list packaging