From: Nathan W. <fac...@us...> - 2005-08-11 04:36:20
|
Update of /cvsroot/gaim/gaim/src/protocols/jabber In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2285/src/protocols/jabber Modified Files: message.c Log Message: invite fix -> HEAD (ladies and gentlemen, this may be the dual-commit that breaks the developer's back) Index: message.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/protocols/jabber/message.c,v retrieving revision 1.43 retrieving revision 1.44 diff -u -d -p -r1.43 -r1.44 --- message.c 2 Apr 2005 17:18:42 -0000 1.43 +++ message.c 11 Aug 2005 04:36:11 -0000 1.44 @@ -313,7 +313,8 @@ void jabber_message_parse(JabberStream * if(timestamp) jm->sent = gaim_str_to_time(timestamp, TRUE); } else if(xmlns && !strcmp(xmlns, "jabber:x:conference") && - jm->type != JABBER_MESSAGE_GROUPCHAT_INVITE) { + jm->type != JABBER_MESSAGE_GROUPCHAT_INVITE && + jm->type != JABBER_MESSAGE_ERROR) { const char *jid = xmlnode_get_attrib(child, "jid"); if(jid) { jm->type = JABBER_MESSAGE_GROUPCHAT_INVITE; @@ -321,7 +322,8 @@ void jabber_message_parse(JabberStream * jm->to = g_strdup(jid); } } else if(xmlns && !strcmp(xmlns, - "http://jabber.org/protocol/muc#user")) { + "http://jabber.org/protocol/muc#user") && + jm->type != JABBER_MESSAGE_ERROR) { xmlnode *invite = xmlnode_get_child(child, "invite"); if(invite) { xmlnode *reason, *password; |