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

The following commit has been merged in the master branch:
commit f682609cd7138e500c03b3c42a8b275217941833
Author: Leon Handreke <leonh at ndreke.de>
Date:   Sun Dec 29 09:01:28 2013 +0100

    Use Conversation model properties instead of ConversationTarget
    
    REVIEW: 114721
---
 chat/org.kde.ktp-chat/contents/ui/ChatWidget.qml               |  8 ++++----
 chat/org.kde.ktp-chat/contents/ui/ConversationDelegate.qml     | 10 +++++-----
 .../contents/ui/ConversationDelegateButton.qml                 |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/chat/org.kde.ktp-chat/contents/ui/ChatWidget.qml b/chat/org.kde.ktp-chat/contents/ui/ChatWidget.qml
index 3a97dc1..fb1fbbd 100644
--- a/chat/org.kde.ktp-chat/contents/ui/ChatWidget.qml
+++ b/chat/org.kde.ktp-chat/contents/ui/ChatWidget.qml
@@ -50,7 +50,7 @@ FocusScope {
             }
             width: height
 
-            icon: conv.target.presenceIcon
+            icon: conv.presenceIcon
         }
 
         PlasmaComponents.Label {
@@ -62,7 +62,7 @@ FocusScope {
                 bottom: parent.bottom
                 leftMargin: 5
             }
-            text: conv.target.nick
+            text: conv.title
             elide: Text.ElideRight
         }
 
@@ -82,8 +82,8 @@ FocusScope {
             ContactPin {
                 id: pin
                 model: pinnedModel
-                contact: chatWidget.conv.target.contact
-                account: chatWidget.conv.target.account
+                contact: chatWidget.conv.targetContact
+                account: chatWidget.conv.account
             }
         }
 
diff --git a/chat/org.kde.ktp-chat/contents/ui/ConversationDelegate.qml b/chat/org.kde.ktp-chat/contents/ui/ConversationDelegate.qml
index 0560c0d..b08235c 100644
--- a/chat/org.kde.ktp-chat/contents/ui/ConversationDelegate.qml
+++ b/chat/org.kde.ktp-chat/contents/ui/ConversationDelegate.qml
@@ -27,11 +27,11 @@ ConversationDelegateButton {
     property alias isCurrentConversation: dialog.visible
     property variant popupSide
     
-    avatar: model.conversation.target.avatar
-    nick: model.conversation.target.nick
-    presenceIconName: model.conversation.target.presenceIconName
-    account: model.conversation.target.account
-    contact: model.conversation.target.contact
+    avatar: model.conversation.avatar
+    title: model.conversation.title
+    presenceIconName: model.conversation.presenceIcon.name
+    account: model.conversation.account
+    contact: model.conversation.targetContact
     onClicked: toggleVisibility()
     
     function toggleVisibility() { setVisible(!isCurrentConversation) }
diff --git a/chat/org.kde.ktp-chat/contents/ui/ConversationDelegateButton.qml b/chat/org.kde.ktp-chat/contents/ui/ConversationDelegateButton.qml
index 4033714..5c621e0 100644
--- a/chat/org.kde.ktp-chat/contents/ui/ConversationDelegateButton.qml
+++ b/chat/org.kde.ktp-chat/contents/ui/ConversationDelegateButton.qml
@@ -30,7 +30,7 @@ PlasmaComponents.ToolButton
     property variant account
     property variant contact
     property alias avatar: icon.icon
-    property alias nick: tooltip.mainText
+    property alias title: tooltip.mainText
     property alias presenceIconName: tooltip.image
     property alias overlay: overlayLoader.sourceComponent
     checked: base.currentIndex==index

-- 
ktp-contact-applet packaging