[SCM] ktp-text-ui packaging branch, master, updated. debian/15.12.1-1-1918-gdf4b0ec

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=102ec6e

The following commit has been merged in the master branch:
commit 102ec6ed0464dcd74a741225433fbf40c2531644
Author: Lasath Fernando <kde at lasath.org>
Date:   Mon Feb 13 14:25:08 2012 +1100

    Set windowType flag of popup to Qt::Tool, to skip the taskbar
    
    BUG: 293519
---
 plasmoid/org.kde.ktp-chatplasmoid/contents/ui/main.qml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/plasmoid/org.kde.ktp-chatplasmoid/contents/ui/main.qml b/plasmoid/org.kde.ktp-chatplasmoid/contents/ui/main.qml
index 4d580aa..27dc83d 100644
--- a/plasmoid/org.kde.ktp-chatplasmoid/contents/ui/main.qml
+++ b/plasmoid/org.kde.ktp-chatplasmoid/contents/ui/main.qml
@@ -8,7 +8,7 @@ import org.kde.plasma.components 0.1 as PlasmaComponents
 Item {
 
     TelepathyTextObserver {
-        id: main
+        id: handler
     }
 
     id: top
@@ -17,9 +17,10 @@ Item {
         anchors.fill: parent
         orientation: Qt.Horizontal
 
-        model: main.conversations
+        model: handler.conversations
 
         delegate : ConversationDelegate {
+            //FIXME: rename the two variables named 'conv' as it's confusing
             id:conv
             anchors.top: parent.top
             anchors.bottom: parent.bottom
@@ -30,7 +31,8 @@ Item {
             //FIXME: put in a loader to not slow down the model
             PlasmaCore.Dialog {
                 id: dialog
-                windowFlags: Qt.Popup
+                //Set as a Tool window to bypass the taskbar
+                windowFlags: Qt.Tool
                 visible: conv.pressed
 
                 mainItem: ChatWidget {

-- 
ktp-text-ui packaging