From e3253f9995f9392e2ed7c74cdda9a2d41c7ca119 Mon Sep 17 00:00:00 2001 From: plfiorini Date: Wed, 19 May 2010 20:56:01 +0000 Subject: [PATCH] Fix what I left broken with last commit on trunk. :P --- protocols/facebook/Facebook.cpp | 10 +++++----- protocols/gtalk/GoogleTalk.cpp | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/protocols/facebook/Facebook.cpp b/protocols/facebook/Facebook.cpp index 8aca610..e019b9f 100644 --- a/protocols/facebook/Facebook.cpp +++ b/protocols/facebook/Facebook.cpp @@ -135,7 +135,7 @@ Facebook::Process(BMessage* msg) case IM_SEND_MESSAGE: { const char* buddy = msg->FindString("id"); - const char* sms = msg->FindString("message"); + const char* sms = msg->FindString("body"); JabberMessage jm; jm.SetTo(buddy); @@ -371,7 +371,7 @@ Facebook::GotMessage(const char* from, const char* message) msg.AddInt32("im_what", IM_MESSAGE_RECEIVED); msg.AddString("protocol", kProtocolSignature); msg.AddString("id", from); - msg.AddString("message", message); + msg.AddString("body", message); fServerMsgr->SendMessage( &msg ); } @@ -386,7 +386,7 @@ Facebook::MessageSent(const char* to, const char* message) msg.AddInt32("im_what", IM_MESSAGE_SENT); msg.AddString("protocol", kProtocolSignature); msg.AddString("id", to); - msg.AddString("message", message); + msg.AddString("body", message); fServerMsgr->SendMessage( &msg ); } @@ -575,7 +575,7 @@ Facebook::SendContactInfo(const JabberContact* jid) msg.AddInt32("im_what", what); msg.AddString("protocol", kProtocolSignature); msg.AddString("id", jid->GetJid()); - msg.AddString("nick", jid->GetName()); + msg.AddString("name ", jid->GetName()); // vCard information JabberVCard* vCard = jid->GetVCard(); @@ -796,7 +796,7 @@ Facebook::OwnContactInfo(JabberContact* contact) msg.AddInt32("im_what", what); msg.AddString("protocol", kProtocolSignature); msg.AddString("id", contact->GetJid()); - msg.AddString("nick", contact->GetName()); + msg.AddString("name", contact->GetName()); // vCard information JabberVCard* vCard = contact->GetVCard(); diff --git a/protocols/gtalk/GoogleTalk.cpp b/protocols/gtalk/GoogleTalk.cpp index d4192d3..1cf81ee 100644 --- a/protocols/gtalk/GoogleTalk.cpp +++ b/protocols/gtalk/GoogleTalk.cpp @@ -135,7 +135,7 @@ GoogleTalk::Process(BMessage* msg) case IM_SEND_MESSAGE: { const char* buddy = msg->FindString("id"); - const char* sms = msg->FindString("message"); + const char* sms = msg->FindString("body"); JabberMessage jm; jm.SetTo(buddy); @@ -371,7 +371,7 @@ GoogleTalk::GotMessage(const char* from, const char* message) msg.AddInt32("im_what", IM_MESSAGE_RECEIVED); msg.AddString("protocol", kProtocolSignature); msg.AddString("id", from); - msg.AddString("message", message); + msg.AddString("body", message); fServerMsgr->SendMessage( &msg ); } @@ -386,7 +386,7 @@ GoogleTalk::MessageSent(const char* to, const char* message) msg.AddInt32("im_what", IM_MESSAGE_SENT); msg.AddString("protocol", kProtocolSignature); msg.AddString("id", to); - msg.AddString("message", message); + msg.AddString("body", message); fServerMsgr->SendMessage( &msg ); } @@ -575,7 +575,7 @@ GoogleTalk::SendContactInfo(const JabberContact* jid) msg.AddInt32("im_what", what); msg.AddString("protocol", kProtocolSignature); msg.AddString("id", jid->GetJid()); - msg.AddString("nick", jid->GetName()); + msg.AddString("name", jid->GetName()); // vCard information JabberVCard* vCard = jid->GetVCard(); @@ -796,7 +796,7 @@ GoogleTalk::OwnContactInfo(JabberContact* contact) msg.AddInt32("im_what", what); msg.AddString("protocol", kProtocolSignature); msg.AddString("id", contact->GetJid()); - msg.AddString("nick", contact->GetName()); + msg.AddString("name", contact->GetName()); // vCard information JabberVCard* vCard = contact->GetVCard();