[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=55a03e5

The following commit has been merged in the master branch:
commit 55a03e5c0968cd929ad0669ba1c60f6d9588f88f
Author: Aleix Pol <aleixpol at kde.org>
Date:   Wed Apr 10 18:51:19 2013 +0200

    These lines shouldn't have been changed in a prior commit
---
 chat/org.kde.ktp-chat/contents/ui/main.qml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/chat/org.kde.ktp-chat/contents/ui/main.qml b/chat/org.kde.ktp-chat/contents/ui/main.qml
index d48ea38..0f18b8b 100644
--- a/chat/org.kde.ktp-chat/contents/ui/main.qml
+++ b/chat/org.kde.ktp-chat/contents/ui/main.qml
@@ -52,7 +52,7 @@ Grid {
         property: "status"
         value: (base.currentIndex >= 0                     ? AcceptingInputStatus
                 : handler.conversations.totalUnreadCount>0 ? NeedsAttentionStatus
-                : handler.conversations.count>0            ? ActiveStatus
+                : conversationsView.count>0                ? ActiveStatus
                                                            : PassiveStatus)
     }
 
@@ -105,6 +105,7 @@ Grid {
                                 : base.flow === Flow.LeftToRight ? Qt.AlignBottom : Qt.AlignRight
 
     Repeater {
+        id: conversationsView
         delegate: ConversationDelegate {
             width: base.itemWidth
             height: base.itemHeight

-- 
ktp-contact-applet packaging