[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=1a665de

The following commit has been merged in the master branch:
commit 1a665de67d0744f250c0b60f211f8e031c2e57a5
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Thu Apr 11 13:54:22 2013 +0200

    Use status message from the passed presence
    
    Right now we always take the status message of the current presence and
    apply it to the selected presence from the plasmoid. With this it will
    always use whatever status message is passed through the KTp::Presence.
    
    Also makes it future-proof (tm) for when we implement custom status
    messages for the plasmoid.
    
    Reviewed-by: David Edmundson
    BUG: 292305
    FIXED-IN: 0.6.1
---
 presence/src/presence-applet.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/presence/src/presence-applet.cpp b/presence/src/presence-applet.cpp
index 06b2291..6aff3aa 100644
--- a/presence/src/presence-applet.cpp
+++ b/presence/src/presence-applet.cpp
@@ -330,7 +330,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->requestedPresence().statusMessage());
+    p.setStatus(p.type(), p.status(), p.statusMessage());
 
     m_globalPresence->setPresence(p);
 }

-- 
ktp-contact-applet packaging