Mercurial > pidgin.yaz

diff src/protocols/jabber/message.c @ 7630:2df4d470c12a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 8254] i heart jabber committer: Tailor Script <tailor@pidgin.im>
author Nathan Walp <nwalp@pidgin.im>
date Tue, 25 Nov 2003 06:56:44 +0000
parents f3f47de6d8a7
children 9008b5be4275
line wrap: on
line diff
--- a/src/protocols/jabber/message.c	Tue Nov 25 05:26:17 2003 +0000
+++ b/src/protocols/jabber/message.c	Tue Nov 25 06:56:44 2003 +0000
@@ -182,9 +182,16 @@
 		gaim_conv_chat_set_topic(GAIM_CONV_CHAT(chat->conv), jid->resource,
 				jm->subject);
 
-	if(jm->xhtml || jm->body)
-		serv_got_chat_in(jm->js->gc, chat->id, jid->resource,
-				0, jm->xhtml ? jm->xhtml : jm->body, jm->sent);
+	if(jm->xhtml || jm->body) {
+		if(jid->resource)
+			serv_got_chat_in(jm->js->gc, chat->id, jid->resource, 0,
+							jm->xhtml ? jm->xhtml : jm->body, jm->sent);
+		else if(chat->muc)
+			gaim_conv_chat_write(GAIM_CONV_CHAT(chat->conv), "",
+							jm->xhtml ? jm->xhtml : jm->body,
+							GAIM_MESSAGE_SYSTEM, jm->sent);
+	}
+
 	jabber_id_free(jid);
 }