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

The following commit has been merged in the master branch:
commit 0657159b437591fbfe98e4e2cb671d21071fd37e
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Mon May 30 12:13:19 2011 +0100

    Fix groups model "note updated" signal, removed horrific hack which kept invalidating the model filter.
    
    BUG: 273725
    REVIEW: 101473
---
 main-widget.cpp     | 4 ----
 proxy-tree-node.cpp | 8 +++++++-
 proxy-tree-node.h   | 1 +
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/main-widget.cpp b/main-widget.cpp
index 217ca05..4b6c248 100644
--- a/main-widget.cpp
+++ b/main-widget.cpp
@@ -325,10 +325,6 @@ 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();
diff --git a/proxy-tree-node.cpp b/proxy-tree-node.cpp
index 0dfa373..3a5dae5 100644
--- a/proxy-tree-node.cpp
+++ b/proxy-tree-node.cpp
@@ -23,6 +23,7 @@
 #include "proxy-tree-node.h"
 #include "tree-node.h"
 #include "contact-model-item.h"
+#include "accounts-model.h"
 
 struct ProxyTreeNode::Private
 {
@@ -54,7 +55,7 @@ ProxyTreeNode::ProxyTreeNode(ContactModelItem *sourceNode)
 
     connect(sourceNode,
             SIGNAL(changed(TreeNode*)),
-            SIGNAL(changed(TreeNode*)));
+            SLOT(onSourceChanged()));
 }
 
 ProxyTreeNode::~ProxyTreeNode()
@@ -82,3 +83,8 @@ void ProxyTreeNode::onSourceNodeRemoved()
 
     remove();
 }
+
+void ProxyTreeNode::onSourceChanged()
+{
+    emit changed(this);
+}
diff --git a/proxy-tree-node.h b/proxy-tree-node.h
index 347210a..ae123d1 100644
--- a/proxy-tree-node.h
+++ b/proxy-tree-node.h
@@ -41,6 +41,7 @@ public:
 
 public Q_SLOTS:
     void onSourceNodeRemoved();
+    void onSourceChanged();
 
 Q_SIGNALS:
     void contactAddedToGroup(const QString& group);

-- 
ktp-contact-list packaging