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

The following commit has been merged in the master branch:
commit 7aaf8fd3b784f8eeefc6c183e883567e50ef573b
Author: Aleix Pol <aleixpol at kde.org>
Date:   Thu Apr 11 00:46:47 2013 +0200

    Make sure closing a dialog doesn't close other dialogs
    
    Whenever a dialog is requested to be closed, make sure that it's being
    displayed already.
    
    REVIEW: 109949
---
 chat/org.kde.ktp-chat/contents/ui/ConversationDelegate.qml | 8 ++++++--
 1 file changed, 6 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 d309159..cecf252 100644
--- a/chat/org.kde.ktp-chat/contents/ui/ConversationDelegate.qml
+++ b/chat/org.kde.ktp-chat/contents/ui/ConversationDelegate.qml
@@ -35,9 +35,13 @@ ConversationDelegateButton {
     onClicked: toggleVisibility()
     
     function toggleVisibility() { setVisible(!isCurrentConversation) }
-    function setVisible(v) { base.currentIndex = (v ? index : -1) }
-    function closeConversation() { base.currentIndex = -1 }
     function openConversation() { base.currentIndex = index }
+    function setVisible(v) { v ? openConversation() : closeConversation(); }
+    function closeConversation() {
+        if(base.currentIndex == index) {
+            base.currentIndex = -1
+        }
+    }
     
     Component.onCompleted: setVisible(model.conversation.messages.shouldStartOpened)
     

-- 
ktp-contact-applet packaging