[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=cbfe256

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

    Fix presence icon displaying
---
 KTp/Models/kpeopletranslationproxy.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/KTp/Models/kpeopletranslationproxy.cpp b/KTp/Models/kpeopletranslationproxy.cpp
index 2eceab0..b1f32ae 100644
--- a/KTp/Models/kpeopletranslationproxy.cpp
+++ b/KTp/Models/kpeopletranslationproxy.cpp
@@ -64,7 +64,7 @@ QVariant KPeopleTranslationProxy::data(const QModelIndex &proxyIndex, int role)
         case KTp::ContactPresenceTypeRole:
             return translatePresence(contact.custom(QLatin1String("telepathy"), QLatin1String("presence")));
         case KTp::ContactPresenceIconRole:
-            return KPeople::iconForPresenceString(contact.custom(QLatin1String("telepathy"), QLatin1String("presence")));
+            return KPeople::iconNameForPresenceString(contact.custom(QLatin1String("telepathy"), QLatin1String("presence")));
 //         case KTp::ContactPresenceNameRole:
 //             return mapToSource(proxyIndex).data(PersonsModel::PresenceDisplayRole);
         case Qt::DisplayRole:

-- 
ktp-common-internals packaging