[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=568dca8

The following commit has been merged in the master branch:
commit 568dca8a2adc6a1bdaac9a5829ca6385740d75b2
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Sat Sep 22 18:07:38 2012 +0100

    Only set minimum size when not in a panel
    
    BUG: 307220
    Reviewed-by: Daniele E. Domenichelli
---
 presence/src/presence-applet.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/presence/src/presence-applet.cpp b/presence/src/presence-applet.cpp
index d8baeed..bd43780 100644
--- a/presence/src/presence-applet.cpp
+++ b/presence/src/presence-applet.cpp
@@ -65,8 +65,10 @@ TelepathyPresenceApplet::TelepathyPresenceApplet(QObject *parent, const QVariant
     layout->setAlignment(m_icon, Qt::AlignCenter);
     setLayout(layout);
 
-    int iconSize = IconSize(KIconLoader::Small);
-    setMinimumSize(QSize(iconSize, iconSize));
+    if (formFactor() == Plasma::Planar) {
+        int iconSize = IconSize(KIconLoader::Small);
+        setMinimumSize(QSize(iconSize, iconSize));
+    }
 
     connect(m_globalPresence, SIGNAL(currentPresenceChanged(KTp::Presence)), this, SLOT(onPresenceChanged(KTp::Presence)));
 

-- 
ktp-contact-applet packaging