[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=611224f

The following commit has been merged in the master branch:
commit 611224f1fe6765cb7c5b462c27073e2eb000fc11
Author: Aleix Pol <aleixpol at kde.org>
Date:   Fri Feb 13 19:26:13 2015 +0100

    Fix icon on the tooltip hovering a conversation
    
    We are not requiring an icon name but an icon
---
 chat/org.kde.ktp-chat/contents/ui/ConversationDelegate.qml       | 2 +-
 chat/org.kde.ktp-chat/contents/ui/ConversationDelegateButton.qml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/chat/org.kde.ktp-chat/contents/ui/ConversationDelegate.qml b/chat/org.kde.ktp-chat/contents/ui/ConversationDelegate.qml
index 9165f5f..701f721 100644
--- a/chat/org.kde.ktp-chat/contents/ui/ConversationDelegate.qml
+++ b/chat/org.kde.ktp-chat/contents/ui/ConversationDelegate.qml
@@ -29,7 +29,7 @@ ConversationDelegateButton {
     
     avatar: model.conversation.avatar
     title: model.conversation.title
-    presenceIconName: model.conversation.presenceIcon.name
+    presenceIcon: model.conversation.presenceIcon
     account: model.conversation.account
     contact: model.conversation.targetContact
     onClicked: toggleVisibility()
diff --git a/chat/org.kde.ktp-chat/contents/ui/ConversationDelegateButton.qml b/chat/org.kde.ktp-chat/contents/ui/ConversationDelegateButton.qml
index 5fff303..79b4f4a 100644
--- a/chat/org.kde.ktp-chat/contents/ui/ConversationDelegateButton.qml
+++ b/chat/org.kde.ktp-chat/contents/ui/ConversationDelegateButton.qml
@@ -32,7 +32,7 @@ MouseArea
     property variant contact
     property alias avatar: icon.source
     property alias title: toolTip.mainText
-    property alias presenceIconName: toolTip.icon
+    property alias presenceIcon: toolTip.icon
     property alias overlay: overlayLoader.sourceComponent
     property bool needsAttention: false
     property bool focused: base.currentIndex==index

-- 
ktp-contact-applet packaging