[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=45c308e

The following commit has been merged in the master branch:
commit 45c308e8e7835cb44fdf31384bb5759192adc4c4
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Thu Apr 18 02:43:32 2013 +0100

    Update to renamed roles
---
 chat/org.kde.ktp-chat/contents/ui/ActionDelegate.qml | 2 +-
 chat/org.kde.ktp-chat/contents/ui/ChatWidget.qml     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/chat/org.kde.ktp-chat/contents/ui/ActionDelegate.qml b/chat/org.kde.ktp-chat/contents/ui/ActionDelegate.qml
index c6d5871..570e59b 100644
--- a/chat/org.kde.ktp-chat/contents/ui/ActionDelegate.qml
+++ b/chat/org.kde.ktp-chat/contents/ui/ActionDelegate.qml
@@ -23,5 +23,5 @@ import org.kde.plasma.core 0.1 as PlasmaCore
 import org.kde.telepathy 0.1
 
 PlasmaComponents.Label {
-    text: "<i>* " + model.user + " " + model.text + "</i>"
+    text: "<i>* " + model.senderAlias + " " + model.text + "</i>"
 }
diff --git a/chat/org.kde.ktp-chat/contents/ui/ChatWidget.qml b/chat/org.kde.ktp-chat/contents/ui/ChatWidget.qml
index 3004949..784e79e 100644
--- a/chat/org.kde.ktp-chat/contents/ui/ChatWidget.qml
+++ b/chat/org.kde.ktp-chat/contents/ui/ChatWidget.qml
@@ -159,7 +159,7 @@ FocusScope {
             leftMargin: 5
         }
         boundsBehavior: Flickable.StopAtBounds
-        section.property: "user"
+        section.property: "senderId"
         section.delegate: PlasmaComponents.Label { text: section; font.bold: true; anchors.right: parent.right}
         clip: true
         

-- 
ktp-contact-applet packaging