gaim/gaim

fix a jabber invite bug (thanks for tracking it down etan)
oldstatus
2005-08-11, Nathan Walp
a6d64f074b90
Parents d0c056e77d0c
Children 312808e697f6
fix a jabber invite bug (thanks for tracking it down etan)
1 files changed, 4 insertions(+), 2 deletions(-)
  • +4 -2
    src/protocols/jabber/message.c
    • --- a/src/protocols/jabber/message.c Wed Aug 10 12:21:13 2005 -0400
    +++ b/src/protocols/jabber/message.c Thu Aug 11 00:23:11 2005 -0400
    @@ -313,7 +313,8 @@
    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 @@
    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;