# HG changeset patch
# User Nathan Walp <nwalp@pidgin.im>
# Date 1065536448 0
# Node ID 071dee25c48e0c5b4d22993549d1344eb57a429b
# Parent  65acffe70a6dae0a3641b2ccdd5ae76844ca40c3
[gaim-migrate @ 7751]
fix jabber segfault on changing of topic in a chat

committer: Tailor Script <tailor@pidgin.im>

diff -r 65acffe70a6d -r 071dee25c48e src/protocols/jabber/message.c
--- a/src/protocols/jabber/message.c	Tue Oct 07 00:21:53 2003 +0000
+++ b/src/protocols/jabber/message.c	Tue Oct 07 14:20:48 2003 +0000
@@ -144,10 +144,12 @@
 		return;
 
 	if(jm->subject)
-		gaim_conv_chat_set_topic(GAIM_CONV_CHAT(chat->conv), jid->resource, jm->subject);
+		gaim_conv_chat_set_topic(GAIM_CONV_CHAT(chat->conv), jid->resource,
+				jm->subject);
 
-	serv_got_chat_in(jm->js->gc, chat->id, jabber_get_resource(jm->from),
-			0, jm->xhtml ? jm->xhtml : jm->body, jm->sent);
+	if(jm->xhtml || jm->body)
+		serv_got_chat_in(jm->js->gc, chat->id, jabber_get_resource(jm->from),
+				0, jm->xhtml ? jm->xhtml : jm->body, jm->sent);
 	jabber_id_free(jid);
 }