From ee0669cfd1afb1be7bbd362ef44583c6272a8561 Mon Sep 17 00:00:00 2001 From: barrett Date: Tue, 15 May 2012 17:51:03 +0000 Subject: [PATCH] Updated statuses accordingly with the recent Caya changes. --- protocols/msn/MSN.cpp | 3 ++- protocols/xmpp/JabberHandler.cpp | 2 +- protocols/yahoo/Yahoo.cpp | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/protocols/msn/MSN.cpp b/protocols/msn/MSN.cpp index 0c300f0..087b949 100644 --- a/protocols/msn/MSN.cpp +++ b/protocols/msn/MSN.cpp @@ -336,7 +336,7 @@ MSNP::Process(BMessage* msg) if (fLogged) fMainConnection->setState(MSN::STATUS_AWAY, fClientID); break; - case CAYA_EXTENDED_AWAY: + case CAYA_CUSTOM_STATUS: break; case CAYA_DO_NOT_DISTURB: @@ -1242,6 +1242,7 @@ void MSNP::buddyChangedPersonalInfo(MSN::NotificationServerConnection* conn, MSN BMessage msg(IM_MESSAGE); msg.AddInt32("im_what", what); msg.AddString("id", fromPassport.c_str()); + msg.AddString("protocol", kProtocolSignature); msg.AddString("message", pInfo.PSM.c_str()); fServerMsgr->SendMessage(&msg); } diff --git a/protocols/xmpp/JabberHandler.cpp b/protocols/xmpp/JabberHandler.cpp index 9d182c9..d56aba6 100644 --- a/protocols/xmpp/JabberHandler.cpp +++ b/protocols/xmpp/JabberHandler.cpp @@ -686,7 +686,7 @@ JabberHandler::_GlooxStatusToCaya(gloox::Presence::PresenceType type) case gloox::Presence::Away: return CAYA_AWAY; case gloox::Presence::XA: - return CAYA_EXTENDED_AWAY; + return CAYA_CUSTOM_STATUS; case gloox::Presence::DND: return CAYA_DO_NOT_DISTURB; case gloox::Presence::Unavailable: diff --git a/protocols/yahoo/Yahoo.cpp b/protocols/yahoo/Yahoo.cpp index 8abab0c..17545f5 100644 --- a/protocols/yahoo/Yahoo.cpp +++ b/protocols/yahoo/Yahoo.cpp @@ -188,7 +188,7 @@ Yahoo::Process(BMessage * msg) fYahoo->SetAway(YAHOO_STATUS_NOTATDESK, NULL); } break; - case CAYA_EXTENDED_AWAY: + case CAYA_CUSTOM_STATUS: break; case CAYA_DO_NOT_DISTURB: