From 5521c409441172b42a921f1462b371877e1af5d5 Mon Sep 17 00:00:00 2001 From: HanzZ Date: Tue, 19 Feb 2013 18:54:58 +0100 Subject: [PATCH] Fix regression when sending unavailable presences --- src/buddy.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/buddy.cpp b/src/buddy.cpp index 4c112052..fcb6b138 100644 --- a/src/buddy.cpp +++ b/src/buddy.cpp @@ -104,18 +104,15 @@ Swift::Presence::ref Buddy::generatePresenceStanza(int features, bool only_new) Swift::Presence::ref presence = Swift::Presence::create(); presence->setTo(m_rosterManager->getUser()->getJID().toBare()); + presence->setFrom(m_jid); presence->setType(Swift::Presence::Available); if (!statusMessage.empty()) presence->setStatus(statusMessage); - if (s.getType() == Swift::StatusShow::None) { + if (s.getType() == Swift::StatusShow::None) presence->setType(Swift::Presence::Unavailable); - presence->setFrom(Swift::JID(m_jid.getNode(), m_jid.getDomain())); - } - else { - presence->setFrom(m_jid); - } + presence->setShow(s.getType()); if (presence->getType() != Swift::Presence::Unavailable) {