[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=33d846b

The following commit has been merged in the master branch:
commit 33d846bf19a04559adc8d21984faa320c3289fa0
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Sat Nov 16 01:50:44 2013 +0100

    Fix avatars not showing
---
 KTp/Models/kpeopletranslationproxy.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/KTp/Models/kpeopletranslationproxy.cpp b/KTp/Models/kpeopletranslationproxy.cpp
index becc773..7f34009 100644
--- a/KTp/Models/kpeopletranslationproxy.cpp
+++ b/KTp/Models/kpeopletranslationproxy.cpp
@@ -72,7 +72,6 @@ QVariant KPeopleTranslationProxy::data(const QModelIndex &proxyIndex, int role)
         case KTp::RowTypeRole:
             if (mapToSource(proxyIndex).data(KPeople::PersonsModel::PersonIdRole)
                         .toString().startsWith((QLatin1String("kpeople://")))) {
-
                 return KTp::PersonRowType;
             } else {
                 return KTp::ContactRowType;
@@ -86,7 +85,7 @@ QVariant KPeopleTranslationProxy::data(const QModelIndex &proxyIndex, int role)
 //         case KTp::ContactAvatarPathRole:
 //             return mapToSource(proxyIndex).data(PersonsModel::PhotosRole);
         case KTp::ContactAvatarPixmapRole:
-            return contactPixmap(proxyIndex);
+            return mapToSource(proxyIndex).data(KPeople::PersonsModel::PhotoRole);
         case KTp::IdRole:
             return contact.custom(QLatin1String("telepathy"), QLatin1String("contactId"));
 //         case KTp::HeaderTotalUsersRole:

-- 
ktp-common-internals packaging