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

The following commit has been merged in the master branch:
commit 5ccfd9442e4f1f8a65b984db3357ae4c89e60fc8
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Thu Feb 7 00:00:23 2013 +0000

    Use correct display role for contact alias's
---
 .../org.kde.ktp-contactlist/contents/ui/ListContactDelegate.qml       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/contactlist/org.kde.ktp-contactlist/contents/ui/ListContactDelegate.qml b/contactlist/org.kde.ktp-contactlist/contents/ui/ListContactDelegate.qml
index 8bf6418..9bf73d8 100644
--- a/contactlist/org.kde.ktp-contactlist/contents/ui/ListContactDelegate.qml
+++ b/contactlist/org.kde.ktp-contactlist/contents/ui/ListContactDelegate.qml
@@ -50,7 +50,7 @@ Item {
             width: 30;
             height: parent.height;
 
-            icon : (avatar ? avatar : "im-user")
+            icon : (model.avatar ? model.avatar : "im-user")
             anchors {
                 left: parent.left;
                 verticalCenter: parent.verticalCenter;
@@ -59,7 +59,7 @@ Item {
 
         PlasmaComponents.Label {
             id: nickLabel;
-            text: aliasName;
+            text: model.display;
             font.bold: true
             elide: Text.ElideRight
 

-- 
ktp-contact-applet packaging