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

The following commit has been merged in the master branch:
commit 7ffb5bb985b0961ee6ecaa8466fc29b970dca045
Author: Aleix Pol <aleixpol at kde.org>
Date:   Sun Sep 7 10:29:54 2014 +0200

    Use all the space available to show the log
    
    Reviewed by David Edmundson
---
 chat/org.kde.ktp-chat/contents/ui/ChatWidget.qml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/chat/org.kde.ktp-chat/contents/ui/ChatWidget.qml b/chat/org.kde.ktp-chat/contents/ui/ChatWidget.qml
index dba3f47..68fcc88 100644
--- a/chat/org.kde.ktp-chat/contents/ui/ChatWidget.qml
+++ b/chat/org.kde.ktp-chat/contents/ui/ChatWidget.qml
@@ -180,6 +180,7 @@ FocusScope {
     PlasmaComponents.Label {
         id: disconnectedLabel
         visible: !conv.valid
+        height: visible ? contentHeight : 0
 
         anchors {
             left: parent.left

-- 
ktp-contact-applet packaging