[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=984bb9a

The following commit has been merged in the master branch:
commit 984bb9ab5c2b3640126f6eb9a389ee32e3b24041
Author: Daniele E. Domenichelli <ddomenichelli at kde.org>
Date:   Fri Mar 1 13:00:50 2013 +0100

    Fix displaying avatar in ContactGridWidget
---
 KTp/Widgets/contact-grid-widget.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/KTp/Widgets/contact-grid-widget.cpp b/KTp/Widgets/contact-grid-widget.cpp
index 303a869..e4ce9bc 100644
--- a/KTp/Widgets/contact-grid-widget.cpp
+++ b/KTp/Widgets/contact-grid-widget.cpp
@@ -93,7 +93,8 @@ void KTp::ContactGridDelegate::paint(QPainter *painter, const QStyleOptionViewIt
     QRect avatarRect = option.rect.adjusted(0, 0, 0, -textHeight);
     QRect textRect = option.rect.adjusted(0, option.rect.height() - textHeight, 0, -3);
 
-    QPixmap avatar = index.data(Qt::DecorationRole).value<QPixmap>();
+    QPixmap avatar;
+    avatar.load(index.data(KTp::ContactAvatarPathRole).toString());
     if (avatar.isNull()) {
         avatar = KIcon(QLatin1String("im-user-online")).pixmap(option.decorationSize);
     } else if (avatar.width() > option.decorationSize.width() || avatar.height() > option.decorationSize.height()) {

-- 
ktp-common-internals packaging