[SCM] ktp-contact-applet packaging branch, master, updated. debian/15.12.1-1-966-gde83ac5

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-desktop-applets.git;a=commitdiff;h=e1c9352

The following commit has been merged in the master branch:
commit e1c935246c7b019ec6c298dac87b6a7accfbf7b1
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Mon Apr 1 17:53:28 2013 +0100

    Use Contact::AvatarPixmap rather than avatar path for displaying
    
    This allows us to fix any scaling/aspect ratio issues as well as allowing us to display avatars for offline contacts
    
    BUG: 316229
    Reviewed-by: Dominik Cermak
---
 .../org.kde.ktp-contactlist/contents/ui/ListContactDelegate.qml   | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/contactlist/org.kde.ktp-contactlist/contents/ui/ListContactDelegate.qml b/contactlist/org.kde.ktp-contactlist/contents/ui/ListContactDelegate.qml
index 7165f92..aec65b3 100644
--- a/contactlist/org.kde.ktp-contactlist/contents/ui/ListContactDelegate.qml
+++ b/contactlist/org.kde.ktp-contactlist/contents/ui/ListContactDelegate.qml
@@ -27,15 +27,17 @@ PlasmaComponents.ListItem {
     enabled: true
 
     height: Math.ceil(nickLabel.height*1.5)
-    
+
     onClicked: contactList.startChat(model.account, model.contact)
 
-    ExtraComponents.QIconItem {
+    ExtraComponents.QPixmapItem {
         id: avatarLabel
         width: height
         height: parent.height
+        pixmap: model.avatarPixmap
+        fillMode: ExtraComponents.QPixmapItem.PreserveAspectFit
+        smooth: true
 
-        icon: (model.avatar ? model.avatar : "im-user")
         anchors {
             left: parent.left
             verticalCenter: parent.verticalCenter

-- 
ktp-contact-applet packaging