[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=01dc92c

The following commit has been merged in the master branch:
commit 01dc92c1e92eb3408cc651dd9dd3b9a727be51bc
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Mon Jul 1 17:59:35 2013 +0200

    Fix returning Person and Contact row types in translation proxy
---
 KTp/Models/kpeopletranslationproxy.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/KTp/Models/kpeopletranslationproxy.cpp b/KTp/Models/kpeopletranslationproxy.cpp
index 56d8fc5..561a273 100644
--- a/KTp/Models/kpeopletranslationproxy.cpp
+++ b/KTp/Models/kpeopletranslationproxy.cpp
@@ -66,7 +66,8 @@ QVariant KPeopleTranslationProxy::data(const QModelIndex &proxyIndex, int role)
         case Qt::DisplayRole:
             return mapToSource(proxyIndex).data(Qt::DisplayRole);
         case KTp::RowTypeRole:
-            if (sourceModel()->rowCount(mapToSource(proxyIndex)) <= 1) {
+            //PersonsModel has only persons and contacts
+            if (mapToSource(proxyIndex).parent().isValid()) {
                 return KTp::ContactRowType;
             } else {
                 return KTp::PersonRowType;

-- 
ktp-common-internals packaging