[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=27d898d

The following commit has been merged in the master branch:
commit 27d898d83e7bfb91848f3b2b7364fe89524c7a0e
Author: James Smith <smithjd15 at gmail.com>
Date:   Tue May 6 01:14:15 2014 +0200

    Use requestedPresence over currentPresence for showing presence
    
    REVIEW: 117381
---
 presence/src/presence-applet.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/presence/src/presence-applet.cpp b/presence/src/presence-applet.cpp
index 0a80510..f44855a 100644
--- a/presence/src/presence-applet.cpp
+++ b/presence/src/presence-applet.cpp
@@ -88,8 +88,8 @@ TelepathyPresenceApplet::TelepathyPresenceApplet(QObject *parent, const QVariant
         setMinimumSize(QSize(iconSize, iconSize));
     }
 
-    connect(m_globalPresence, SIGNAL(currentPresenceChanged(KTp::Presence)), SLOT(onPresenceChanged(KTp::Presence)));
-    onPresenceChanged(m_globalPresence->currentPresence());
+    connect(m_globalPresence, SIGNAL(requestedPresenceChanged(KTp::Presence)), SLOT(onPresenceChanged(KTp::Presence)));
+    onPresenceChanged(m_globalPresence->requestedPresence());
 
     connect(m_globalPresence, SIGNAL(connectionStatusChanged(Tp::ConnectionStatus)), SLOT(onConnectionStatusChanged(Tp::ConnectionStatus)));
     onConnectionStatusChanged(m_globalPresence->connectionStatus());
@@ -352,7 +352,7 @@ void TelepathyPresenceApplet::toolTipAboutToShow()
     Plasma::ToolTipContent content;
     KUser user;
 
-    QString presenceMsg(m_globalPresence->currentPresence().statusMessage());
+    QString presenceMsg(m_globalPresence->requestedPresence().statusMessage());
 
     content.setImage(KIcon("telepathy-kde"));
     content.setMainText(user.loginName());
@@ -362,7 +362,7 @@ void TelepathyPresenceApplet::toolTipAboutToShow()
     } else if (!presenceMsg.isEmpty()) {
         content.setSubText(presenceMsg);
     } else {
-        content.setSubText(m_globalPresence->currentPresence().displayString());
+        content.setSubText(m_globalPresence->requestedPresence().displayString());
     }
 
     Plasma::ToolTipManager::self()->setContent(this, content);

-- 
ktp-contact-applet packaging