[SCM] ktp-text-ui packaging branch, master, updated. debian/15.12.1-1-1918-gdf4b0ec

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=68a8f91

The following commit has been merged in the master branch:
commit 68a8f916e738a81ea18616d47492596181f08056
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Sun Nov 24 17:28:48 2013 +0100

    Port LogViewer to kpeople2
---
 logviewer/entity-view.cpp               | 2 +-
 logviewer/person-entity-merge-model.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/logviewer/entity-view.cpp b/logviewer/entity-view.cpp
index 6d2ac9b..bf216d1 100644
--- a/logviewer/entity-view.cpp
+++ b/logviewer/entity-view.cpp
@@ -47,7 +47,7 @@ void EntityView::rowsInserted(const QModelIndex &parent, int start, int end)
         const QString selectedPersonaId = KCmdLineArgs::parsedArgs()->arg(0);
         for (int i = start; i <= end; i++) {
             const QModelIndex index = model()->index(i, 0, parent);
-            if (index.data(KTp::NepomukUriRole).toUrl() == selectedPersonaId) {
+            if (index.data(KTp::PersonIdRole).toUrl() == selectedPersonaId) {
                 selectedIndex = index;
                 break;
             }
diff --git a/logviewer/person-entity-merge-model.cpp b/logviewer/person-entity-merge-model.cpp
index 00381c0..5774c17 100644
--- a/logviewer/person-entity-merge-model.cpp
+++ b/logviewer/person-entity-merge-model.cpp
@@ -424,7 +424,7 @@ void PersonEntityMergeModel::initializeModel()
                 bool found = false;
                 for (int k = 0; k < m_contactsModel->rowCount(index); ++k) {
                     const QModelIndex childIndex = m_contactsModel->index(k, 0, index);
-                    if (m_contactsModel->data(childIndex, KTp::IdRole).toStringList().contains(entity.id())) {
+                    if (m_contactsModel->data(childIndex, KTp::IdRole).toString() == entity.id()) {
                         //kDebug() << "	Found matching persona" << m_personsModel->data(index, PersonsModel::UriRole).toString();
                         //kDebug() << "		Found matching contact" << m_personsModel->data(childIndex, PersonsModel::IMRole).toString();
                         parentItem = itemForPersona(index);

-- 
ktp-text-ui packaging