[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=414b444

The following commit has been merged in the master branch:
commit 414b444be68c9e5767fa6802ff650956307c2c71
Author: Aleix Pol <aleixpol at kde.org>
Date:   Mon May 6 14:15:50 2013 +0200

    Don't check if it's moving to follow the conversation
    
    It seems like a good idea, but it's not. It happens that when somebody
    talks to you, it also sets to moving, so we'll skip some jumps to the end
    if the conversation happens too fast.
    
    CCBUG: 317853
---
 chat/org.kde.ktp-chat/contents/ui/ChatWidget.qml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/chat/org.kde.ktp-chat/contents/ui/ChatWidget.qml b/chat/org.kde.ktp-chat/contents/ui/ChatWidget.qml
index 3004949..613c6a2 100644
--- a/chat/org.kde.ktp-chat/contents/ui/ChatWidget.qml
+++ b/chat/org.kde.ktp-chat/contents/ui/ChatWidget.qml
@@ -189,7 +189,7 @@ FocusScope {
         onMovementEnded: followConversation = atYEnd //we only follow the conversation if moved to the end
 
         onCountChanged: {
-            if(!moving && followConversation && contentHeight>height) {
+            if(followConversation && contentHeight>height) {
                 view.positionViewAtEnd()
             }
         }

-- 
ktp-contact-applet packaging