[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=45eb6cc

The following commit has been merged in the master branch:
commit 45eb6cc26503a6e0dde201ee19ac691a93ab8567
Merge: 4b439cbee6af79a23a83b0b31e2aebc8cd83284c 9b7719c53f92f5341ea7f7b4e8cc423f32445f96
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Tue Dec 11 12:47:57 2012 -0800

    Merge branch 'kde-telepathy-0.5'
    
    Conflicts:
    	plasma_applet_ktp_presence.desktop
    	src/presenceapplet.cpp

 presence/src/presence-applet.cpp | 29 +++++++++++++++++++++++++----
 presence/src/presence-applet.h   |  1 +
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --cc presence/src/presence-applet.cpp
index fa9e47f,f941c67..6cc7b05
--- a/presence/src/presence-applet.cpp
+++ b/presence/src/presence-applet.cpp
@@@ -73,13 -65,15 +72,17 @@@ 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)));
+     connect(m_globalPresence, SIGNAL(currentPresenceChanged(KTp::Presence)), SLOT(onPresenceChanged(KTp::Presence)));
+     onPresenceChanged(m_globalPresence->currentPresence());
+ 
+     connect(m_globalPresence, SIGNAL(connectionStatusChanged(Tp::ConnectionStatus)), SLOT(onConnectionStatusChanged(Tp::ConnectionStatus)));
+     onConnectionStatusChanged(m_globalPresence->connectionStatus());
+ 
  
      setStatus(Plasma::PassiveStatus);
  
diff --cc presence/src/presence-applet.h
index 3ae55cb,a20b7c8..3b0caf5
--- a/presence/src/presence-applet.h
+++ b/presence/src/presence-applet.h
@@@ -58,8 -59,8 +58,9 @@@ private Q_SLOTS
      void onAccountsChanged();
  
      void onPresenceChanged(KTp::Presence presence);
+     void onConnectionStatusChanged(Tp::ConnectionStatus connectionStatus);
      void onPresenceActionClicked();
 +    void onJoinChatRoomRequest();
      void toolTipAboutToShow();
      void toolTipHidden();
  

-- 
ktp-contact-applet packaging