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

The following commit has been merged in the master branch:
commit c432780d13b3b5c76a06a86173b2788114c43628
Author: Aleix Pol <aleixpol at kde.org>
Date:   Tue Apr 15 12:37:37 2014 +0200

    Fix display of the chat dialogs
---
 chat/org.kde.ktp-chat/contents/ui/ConversationDelegate.qml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/chat/org.kde.ktp-chat/contents/ui/ConversationDelegate.qml b/chat/org.kde.ktp-chat/contents/ui/ConversationDelegate.qml
index 5ecacd1..a9fc011 100644
--- a/chat/org.kde.ktp-chat/contents/ui/ConversationDelegate.qml
+++ b/chat/org.kde.ktp-chat/contents/ui/ConversationDelegate.qml
@@ -50,6 +50,7 @@ ConversationDelegateButton {
         id: dialog
 //         windowFlags: Qt.WindowStaysOnTopHint
         visible: base.currentIndex==index
+        location: plasmoid.location
 
         mainItem: ChatWidget {
             id: chatWidget
@@ -60,15 +61,15 @@ ConversationDelegateButton {
             onCloseRequested: closeConversation()
         }
 
+        //if we are opening the dialog right away (e.g. started chat from pinned)
+        //when we open the dialog by the button plasma will collapse because the
+        //item is not positioned yet. Use the plasmoid root instead, in those cases
+        visualParent: convButton.state==Component.Ready ? convButton : base
+
         onVisibleChanged: {
             if(visible) {
                 windowHide.hideWindowFromTaskbar(dialog.windowId)
 
-                //if we are opening the dialog right away (e.g. started chat from pinned)
-                //when we open the dialog by the button plasma will collapse because the
-                //item is not positioned yet. Use the plasmoid root instead, in those cases
-                var item = convButton.state==Component.Ready ? convButton : base;
-
                 dialog.visualParent = item;
             } else if(base.currentIndex == index) {
                 closeConversation();

-- 
ktp-contact-applet packaging