Mercurial > pidgin.yaz

changeset 11230:11b43807d6a6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[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>
author Nathan Walp <nwalp@pidgin.im>
date Thu, 11 Aug 2005 04:36:11 +0000
parents 67f874fadb57
children 64e2c65ef650
files src/protocols/jabber/message.c
diffstat 1 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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;