# HG changeset patch
# User Nathan Walp <nwalp@pidgin.im>
# Date 1123734971 0
# Node ID 11b43807d6a6672e83810eb0cc16efa23d4dd34a
# Parent  67f874fadb578d91551431a2c7a6c3ea26f8f8df
[gaim-migrate @ 13370]
invite fix -> HEAD

(ladies and gentlemen, this may be the dual-commit that breaks the developer's back)

committer: Tailor Script <tailor@pidgin.im>

diff -r 67f874fadb57 -r 11b43807d6a6 src/protocols/jabber/message.c
--- a/src/protocols/jabber/message.c	Thu Aug 11 04:30:23 2005 +0000
+++ b/src/protocols/jabber/message.c	Thu Aug 11 04:36:11 2005 +0000
@@ -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;