jadedctrl/Chat-O-Matic
jadedctrl/ Chat-O-Matic
1
0
Disbranĉigi 0
Fontkodo Issues 20 Tirpetoj Actions Packages Projects Eldonoj 2 Wiki Activity

Fix what I left broken with last commit on trunk. :P

This commit is contained in:
plfiorini 2010-05-19 20:56:01 +00:00
parent 2ee14f4c14
commit e3253f9995
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
protocols/facebook/Facebook.cpp
View File

@ -135,7 +135,7 @@ Facebook::Process(BMessage* msg)
case IM_SEND_MESSAGE: case IM_SEND_MESSAGE:
{ {
const char* buddy = msg->FindString("id"); const char* buddy = msg->FindString("id");
const char* sms = msg->FindString("message"); const char* sms = msg->FindString("body");
JabberMessage jm; JabberMessage jm;
jm.SetTo(buddy); jm.SetTo(buddy);
@ -371,7 +371,7 @@ Facebook::GotMessage(const char* from, const char* message)
msg.AddInt32("im_what", IM_MESSAGE_RECEIVED); msg.AddInt32("im_what", IM_MESSAGE_RECEIVED);
msg.AddString("protocol", kProtocolSignature); msg.AddString("protocol", kProtocolSignature);
msg.AddString("id", from); msg.AddString("id", from);
msg.AddString("message", message); msg.AddString("body", message);
fServerMsgr->SendMessage( &msg ); fServerMsgr->SendMessage( &msg );
} }
@ -386,7 +386,7 @@ Facebook::MessageSent(const char* to, const char* message)
msg.AddInt32("im_what", IM_MESSAGE_SENT); msg.AddInt32("im_what", IM_MESSAGE_SENT);
msg.AddString("protocol", kProtocolSignature); msg.AddString("protocol", kProtocolSignature);
msg.AddString("id", to); msg.AddString("id", to);
msg.AddString("message", message); msg.AddString("body", message);
fServerMsgr->SendMessage( &msg ); fServerMsgr->SendMessage( &msg );
} }
@ -575,7 +575,7 @@ Facebook::SendContactInfo(const JabberContact* jid)
msg.AddInt32("im_what", what); msg.AddInt32("im_what", what);
msg.AddString("protocol", kProtocolSignature); msg.AddString("protocol", kProtocolSignature);
msg.AddString("id", jid->GetJid()); msg.AddString("id", jid->GetJid());
msg.AddString("nick", jid->GetName()); msg.AddString("name ", jid->GetName());
// vCard information // vCard information
JabberVCard* vCard = jid->GetVCard(); JabberVCard* vCard = jid->GetVCard();
@ -796,7 +796,7 @@ Facebook::OwnContactInfo(JabberContact* contact)
msg.AddInt32("im_what", what); msg.AddInt32("im_what", what);
msg.AddString("protocol", kProtocolSignature); msg.AddString("protocol", kProtocolSignature);
msg.AddString("id", contact->GetJid()); msg.AddString("id", contact->GetJid());
msg.AddString("nick", contact->GetName()); msg.AddString("name", contact->GetName());
// vCard information // vCard information
JabberVCard* vCard = contact->GetVCard(); JabberVCard* vCard = contact->GetVCard();

10
protocols/gtalk/GoogleTalk.cpp
View File

@ -135,7 +135,7 @@ GoogleTalk::Process(BMessage* msg)
case IM_SEND_MESSAGE: case IM_SEND_MESSAGE:
{ {
const char* buddy = msg->FindString("id"); const char* buddy = msg->FindString("id");
const char* sms = msg->FindString("message"); const char* sms = msg->FindString("body");
JabberMessage jm; JabberMessage jm;
jm.SetTo(buddy); jm.SetTo(buddy);
@ -371,7 +371,7 @@ GoogleTalk::GotMessage(const char* from, const char* message)
msg.AddInt32("im_what", IM_MESSAGE_RECEIVED); msg.AddInt32("im_what", IM_MESSAGE_RECEIVED);
msg.AddString("protocol", kProtocolSignature); msg.AddString("protocol", kProtocolSignature);
msg.AddString("id", from); msg.AddString("id", from);
msg.AddString("message", message); msg.AddString("body", message);
fServerMsgr->SendMessage( &msg ); fServerMsgr->SendMessage( &msg );
} }
@ -386,7 +386,7 @@ GoogleTalk::MessageSent(const char* to, const char* message)
msg.AddInt32("im_what", IM_MESSAGE_SENT); msg.AddInt32("im_what", IM_MESSAGE_SENT);
msg.AddString("protocol", kProtocolSignature); msg.AddString("protocol", kProtocolSignature);
msg.AddString("id", to); msg.AddString("id", to);
msg.AddString("message", message); msg.AddString("body", message);
fServerMsgr->SendMessage( &msg ); fServerMsgr->SendMessage( &msg );
} }
@ -575,7 +575,7 @@ GoogleTalk::SendContactInfo(const JabberContact* jid)
msg.AddInt32("im_what", what); msg.AddInt32("im_what", what);
msg.AddString("protocol", kProtocolSignature); msg.AddString("protocol", kProtocolSignature);
msg.AddString("id", jid->GetJid()); msg.AddString("id", jid->GetJid());
msg.AddString("nick", jid->GetName()); msg.AddString("name", jid->GetName());
// vCard information // vCard information
JabberVCard* vCard = jid->GetVCard(); JabberVCard* vCard = jid->GetVCard();
@ -796,7 +796,7 @@ GoogleTalk::OwnContactInfo(JabberContact* contact)
msg.AddInt32("im_what", what); msg.AddInt32("im_what", what);
msg.AddString("protocol", kProtocolSignature); msg.AddString("protocol", kProtocolSignature);
msg.AddString("id", contact->GetJid()); msg.AddString("id", contact->GetJid());
msg.AddString("nick", contact->GetName()); msg.AddString("name", contact->GetName());
// vCard information // vCard information
JabberVCard* vCard = contact->GetVCard(); JabberVCard* vCard = contact->GetVCard();