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

The following commit has been merged in the master branch:
commit ff3c88591aa1c19408ac556e1b7826692f1122b1
Author: Aleix Pol <aleixpol at kde.org>
Date:   Tue Feb 19 02:39:00 2013 +0100

    Catch all cases where the window is hidden
    
    We were omitting the case where the user would close the dialog by pressing
    the Escape key, this is not the case anymore.
    Also make some scoping evident with some () somewhere else.
    
    REVIEW: 109032
---
 chat/org.kde.ktp-chat/contents/ui/ConversationDelegate.qml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/chat/org.kde.ktp-chat/contents/ui/ConversationDelegate.qml b/chat/org.kde.ktp-chat/contents/ui/ConversationDelegate.qml
index 09049a3..74cbb36 100644
--- a/chat/org.kde.ktp-chat/contents/ui/ConversationDelegate.qml
+++ b/chat/org.kde.ktp-chat/contents/ui/ConversationDelegate.qml
@@ -32,7 +32,7 @@ ConversationDelegateButton {
     onClicked: toggleVisibility()
     
     function toggleVisibility() { setVisible(!isCurrentConversation) }
-    function setVisible(v) { base.currentIndex = v ? index : -1 }
+    function setVisible(v) { base.currentIndex = (v ? index : -1) }
     function closeConversation() { base.currentIndex = -1 }
     function openConversation() { base.currentIndex = index }
     
@@ -71,6 +71,8 @@ ConversationDelegateButton {
                 dialog.x = point.x;
                 dialog.y = point.y;
                 dialog.activateWindow()
+            } else if(base.currentIndex != -1) {
+                closeConversation()
             }
         }
     }

-- 
ktp-contact-applet packaging