[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=3b7a541

The following commit has been merged in the master branch:
commit 3b7a541d1ef8634b336ba9bd64a70dc4cc7027c3
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Fri Mar 1 17:40:20 2013 +0000

    Show request presence in presence applet rather than current
    
    This brings it in line with the contact list
    
    BUG: 302508
    REVIEWED-BY: Martin Klapetek
---
 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 8037b67..acd6635 100644
--- a/presence/src/presence-applet.cpp
+++ b/presence/src/presence-applet.cpp
@@ -77,8 +77,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());
@@ -310,7 +310,7 @@ void TelepathyPresenceApplet::onConnectionStatusChanged(Tp::ConnectionStatus con
 void TelepathyPresenceApplet::onPresenceActionClicked()
 {
     KTp::Presence p = qobject_cast<KAction*>(sender())->data().value<KTp::Presence>();
-    p.setStatus(p.type(), p.status(), m_globalPresence->currentPresence().statusMessage());
+    p.setStatus(p.type(), p.status(), m_globalPresence->requestedPresence().statusMessage());
 
     m_globalPresence->setPresence(p);
 }

-- 
ktp-contact-applet packaging