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

The following commit has been merged in the master branch:
commit fbee50e0c52ca922898f92cc4086d84fa4c3873f
Merge: 2df9c5b04b82c34365a257ea748648b20e6e4dec 568dca8a2adc6a1bdaac9a5829ca6385740d75b2
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Mon Nov 19 12:29:35 2012 +0900

    Merge branch 'kde-telepathy-0.5'

 presence/src/presence-applet.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --cc presence/src/presence-applet.cpp
index 326f1b9,bd43780..a4f4c4d
--- a/presence/src/presence-applet.cpp
+++ b/presence/src/presence-applet.cpp
@@@ -72,13 -65,12 +72,15 @@@ TelepathyPresenceApplet::TelepathyPrese
      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)));
 +    connect(m_globalPresence, SIGNAL(changingPresence(bool)), this, SLOT(setBusy(bool)));
 +
 +    setStatus(Plasma::PassiveStatus);
  
      setStatus(Plasma::PassiveStatus);
  

-- 
ktp-contact-applet packaging