[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=0e6e873

The following commit has been merged in the master branch:
commit 0e6e8730c5bc8b6a0a76fadc261a3a91e59ec0c7
Merge: ba5f13ac4323dbaca339851e4095b99e905439aa 6f2cd5c8bb84574ef9bee2e40773aba3babd8e1c
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Fri Sep 28 17:28:17 2012 +0200

    Merge branch 'kde-telepathy-0.5'

 presence/plasma-applet-ktp-presence.desktop | 2 --
 presence/src/presence-applet.cpp            | 3 +++
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --cc presence/src/presence-applet.cpp
index 4beb5da,59d0568..33fc8cc
--- a/presence/src/presence-applet.cpp
+++ b/presence/src/presence-applet.cpp
@@@ -73,9 -69,10 +73,12 @@@ TelepathyPresenceApplet::TelepathyPrese
      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);
 +
      // register plasmoid for tooltip
      Plasma::ToolTipManager::self()->registerWidget(this);
  }

-- 
ktp-contact-applet packaging