[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=5c68dd3

The following commit has been merged in the master branch:
commit 5c68dd3fdc3a1e4028c61e925f3f1bbe321e4714
Author: Aleix Pol <aleixpol at kde.org>
Date:   Wed Feb 11 19:27:34 2015 +0100

    Adapt to changes in kpeople
---
 KTp/Models/kpeopletranslationproxy.cpp | 2 +-
 kpeople/uiplugins/imdetailswidget.cpp  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/KTp/Models/kpeopletranslationproxy.cpp b/KTp/Models/kpeopletranslationproxy.cpp
index f6967da..04164d6 100644
--- a/KTp/Models/kpeopletranslationproxy.cpp
+++ b/KTp/Models/kpeopletranslationproxy.cpp
@@ -93,7 +93,7 @@ QVariant KPeopleTranslationProxy::data(const QModelIndex &proxyIndex, int role)
         case KTp::ContactGroupsRole:
             return sourceIndex.data(PersonsModel::GroupsRole);
         case KTp::PersonIdRole:
-            return sourceIndex.data(PersonsModel::PersonIdRole);
+            return sourceIndex.data(PersonsModel::PersonUriRole);
         case KTp::ContactVCardRole:
             return sourceIndex.data(KPeople::PersonsModel::PersonVCardRole);
     }
diff --git a/kpeople/uiplugins/imdetailswidget.cpp b/kpeople/uiplugins/imdetailswidget.cpp
index 476cd1d..bc8ee07 100644
--- a/kpeople/uiplugins/imdetailswidget.cpp
+++ b/kpeople/uiplugins/imdetailswidget.cpp
@@ -54,7 +54,7 @@ QWidget* ImDetailsWidget::createDetailsWidget(const KPeople::PersonData &person,
     root->setLayout(layout);
 
     int row = 0;
-    for(const QString &contactId: person.contactIds()) {
+    for(const QString &contactId: person.contactUris()) {
         PersonData contact(contactId);
         const QString tpcontactId = contact.contactCustomProperty(QStringLiteral("telepathy-contactId")).toString();
         const QString accountPath = contact.contactCustomProperty(QStringLiteral("telepathy-accountPath")).toString(); //probably unused till we fix everything properly

-- 
ktp-common-internals packaging