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

The following commit has been merged in the master branch:
commit b8feb422481c0175f7893d47aa227d0da6cccb77
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Thu Jan 19 20:41:50 2012 +0000

    Use ConnectionStatus to determine when connecting or not.
    
    also fix some poor use of "else"
    
    Reviewed by: Dominik Cermak
    BUG: 291843
---
 presence/src/presence-applet.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/presence/src/presence-applet.cpp b/presence/src/presence-applet.cpp
index ae78dd9..476076a 100644
--- a/presence/src/presence-applet.cpp
+++ b/presence/src/presence-applet.cpp
@@ -235,11 +235,11 @@ void TelepathyPresenceApplet::toolTipAboutToShow()
     content.setImage(KIcon("telepathy-kde"));
     content.setMainText(user.loginName());
 
-    if (m_globalPresence->isChangingPresence()) {
+    if (m_globalPresence->connectionStatus() == Tp::ConnectionStatusConnecting) {
         content.setSubText(i18n("Connecting..."));
-    } else if (!presenceMsg.isEmpty() && !m_globalPresence->isChangingPresence()) {
+    } else if (!presenceMsg.isEmpty()) {
         content.setSubText(presenceMsg);
-    } else if (presenceMsg.isEmpty() && !m_globalPresence->isChangingPresence()) {
+    } else {
         content.setSubText(m_globalPresence->currentPresence().displayString());
     }
 

-- 
ktp-contact-applet packaging