[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=3346e8d

The following commit has been merged in the master branch:
commit 3346e8d6906c63523f3e50e855f92523d0b90bf1
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Tue May 24 11:42:35 2011 +0200

    Move the obscure connection to MainWidget as it does not work in AccountFilterModel constructor (sourceModel() is null) and there's no use creating a special method for that, so I moved it to MainWidget. Works.
    Reviewed-by: Francesco Nwokeka
---
 account-filter-model.cpp | 4 +---
 main-widget.cpp          | 4 ++++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/account-filter-model.cpp b/account-filter-model.cpp
index 4a8df8c..2542ae6 100644
--- a/account-filter-model.cpp
+++ b/account-filter-model.cpp
@@ -30,9 +30,7 @@ AccountFilterModel::AccountFilterModel(QObject *parent)
       m_filterOfflineUsers(false),
       m_filterByName(false)
 {
-    //FIXME FIXME FIXME -- this is an ugly workaround for some filter-misbehaving issues, need to investigate
-    connect(sourceModel(), SIGNAL(dataChanged(QModelIndex,QModelIndex)),
-            this, SLOT(invalidate()));
+
 }
 
 void AccountFilterModel::filterOfflineUsers(bool filterOfflineUsers)
diff --git a/main-widget.cpp b/main-widget.cpp
index fa6307c..4b7bfd4 100644
--- a/main-widget.cpp
+++ b/main-widget.cpp
@@ -325,6 +325,10 @@ void MainWidget::onAccountManagerReady(Tp::PendingOperation* op)
     connect(m_modelFilter, SIGNAL(rowsAboutToBeRemoved(QModelIndex, int, int)),
         m_delegate, SLOT(contactRemoved(QModelIndex,int,int)));
 
+    //FIXME FIXME FIXME -- this is an ugly workaround for some filter-misbehaving issues, need to investigate
+    connect(m_modelFilter->sourceModel(), SIGNAL(dataChanged(QModelIndex,QModelIndex)),
+            m_modelFilter, SLOT(invalidate()));
+
     m_accountButtonsLayout->insertStretch(-1);
 
     QList<Tp::AccountPtr> accounts = m_accountManager->allAccounts();

-- 
ktp-contact-list packaging