[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=3e4452e

The following commit has been merged in the master branch:
commit 3e4452e963cc918f0ec089b82494874dd2b25e04
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Sun Mar 17 18:58:46 2013 +0000

    Correct row count in contacts list model for non root items
    
    Reviewed-by: Martin Klapetek
---
 KTp/Models/contacts-list-model.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/KTp/Models/contacts-list-model.cpp b/KTp/Models/contacts-list-model.cpp
index 8c68581..aede8bb 100644
--- a/KTp/Models/contacts-list-model.cpp
+++ b/KTp/Models/contacts-list-model.cpp
@@ -80,8 +80,11 @@ void KTp::ContactsListModel::setAccountManager(const Tp::AccountManagerPtr &acco
 
 int KTp::ContactsListModel::rowCount(const QModelIndex &parent) const
 {
-    Q_UNUSED (parent);
-    return d->contacts.size();
+    if (!parent.isValid()) {
+        return d->contacts.size();
+    } else {
+        return 0;
+    }
 }
 
 QVariant KTp::ContactsListModel::data(const QModelIndex &index, int role) const

-- 
ktp-common-internals packaging