[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=05981c0

The following commit has been merged in the master branch:
commit 05981c002e91904144fe46dd7c22f199a53f567a
Author: Lasath Fernando <kde at lasath.org>
Date:   Tue Dec 6 11:45:10 2011 +1100

    Fixed binding loop for ConversationDelegate.size
---
 chat/org.kde.ktp-chat/contents/ui/ChatWidget.qml    |  1 +
 .../contents/ui/ConversationDelegate.qml            | 21 ++++++++++++++-------
 chat/org.kde.ktp-chat/metadata.desktop              |  2 +-
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/chat/org.kde.ktp-chat/contents/ui/ChatWidget.qml b/chat/org.kde.ktp-chat/contents/ui/ChatWidget.qml
index af1dc4e..24231f3 100644
--- a/chat/org.kde.ktp-chat/contents/ui/ChatWidget.qml
+++ b/chat/org.kde.ktp-chat/contents/ui/ChatWidget.qml
@@ -95,6 +95,7 @@ Item {
             }
 
             flickableItem: view
+            interactive: true
             width: 16
             opacity: 1
             orientation: Qt.Vertical
diff --git a/chat/org.kde.ktp-chat/contents/ui/ConversationDelegate.qml b/chat/org.kde.ktp-chat/contents/ui/ConversationDelegate.qml
index 6ddffeb..da0c4a8 100644
--- a/chat/org.kde.ktp-chat/contents/ui/ConversationDelegate.qml
+++ b/chat/org.kde.ktp-chat/contents/ui/ConversationDelegate.qml
@@ -15,7 +15,8 @@ Item {
 //         anchors.margins: 5
     }
 //     height: icon.height + 10
-    width: icon.width + 10
+//     width: icon.width + 10
+    width: height
 
     PlasmaCore.Dialog {
         id: dialog
@@ -36,17 +37,23 @@ Item {
         icon: model.conversation.target.presenceIcon
 //         anchors {
 //             top: parent.top
-//             left: parent.left
+//             bottom: parent.bottom
+// //             left: parent.left
 //         }
         anchors.fill: parent
         anchors.margins: 5
+//         width: height
 
 //         size: "32x32"
-        size: {
-            console.log("height = " + parent.height);
-            console.log("width = " + parent.width);
-            return Qt.size(parent.height, parent.height);
-        }
+//         size: {
+//             console.log("height = " + parent.height);
+//             console.log("width = " + parent.width);
+//             return Qt.size(icon.height, icon.height);
+//         }
+//         Component.onCompleted: {
+//             console.log("height = " + parent.height);
+//             console.log("width = " + parent.width);
+//         }
     }
 
     MouseArea {
diff --git a/chat/org.kde.ktp-chat/metadata.desktop b/chat/org.kde.ktp-chat/metadata.desktop
index 75d4f67..88d345e 100644
--- a/chat/org.kde.ktp-chat/metadata.desktop
+++ b/chat/org.kde.ktp-chat/metadata.desktop
@@ -5,7 +5,7 @@ Icon=kde-telepathy
 
 X-Plasma-API=declarativeappletscript
 X-Plasma-MainScript=ui/main.qml
-X-Plasma-DefaultSize=300,48
+X-Plasma-DefaultSize=300,68
 # X-Plasma-RequiredExtensions=LaunchApp
 
 X-KDE-PluginInfo-Author=Frederik Gladhorn

-- 
ktp-contact-applet packaging