[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=2077c85

The following commit has been merged in the master branch:
commit 2077c85725dfd1835b5073cae7e3fa3be574ef08
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Tue Mar 26 17:06:28 2013 +0100

    Always return all subcontacts of a metacontact
    
    Reviewed-by: David Edmundson
---
 KTp/Models/contacts-filter-model.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/KTp/Models/contacts-filter-model.cpp b/KTp/Models/contacts-filter-model.cpp
index 42e938d..d5f26cf 100644
--- a/KTp/Models/contacts-filter-model.cpp
+++ b/KTp/Models/contacts-filter-model.cpp
@@ -126,6 +126,11 @@ bool ContactsFilterModel::Private::filterAcceptsContact(const QModelIndex &index
         return false;
     }
 
+    //always return all subcontacts of a metacontact
+    if (index.parent().isValid() && index.parent().data(KTp::RowTypeRole).toUInt() == KTp::PersonRowType) {
+        return true;
+    }
+
     // Check presence type
     if (presenceTypeFilterFlags != DoNotFilterByPresence) {
         switch (static_cast<Tp::ConnectionPresenceType>(index.data(KTp::ContactPresenceTypeRole).toUInt())) {

-- 
ktp-common-internals packaging