comparison src/protocols/jabber/message.c @ 7183:071dee25c48e

[gaim-migrate @ 7751] fix jabber segfault on changing of topic in a chat committer: Tailor Script <tailor@pidgin.im>
author Nathan Walp <nwalp@pidgin.im>
date Tue, 07 Oct 2003 14:20:48 +0000
parents 0e4894b3e2a6
children 0f16c37aa472
comparison
equal deleted inserted replaced
7182:65acffe70a6d 7183:071dee25c48e
142 142
143 if(!chat) 143 if(!chat)
144 return; 144 return;
145 145
146 if(jm->subject) 146 if(jm->subject)
147 gaim_conv_chat_set_topic(GAIM_CONV_CHAT(chat->conv), jid->resource, jm->subject); 147 gaim_conv_chat_set_topic(GAIM_CONV_CHAT(chat->conv), jid->resource,
148 148 jm->subject);
149 serv_got_chat_in(jm->js->gc, chat->id, jabber_get_resource(jm->from), 149
150 0, jm->xhtml ? jm->xhtml : jm->body, jm->sent); 150 if(jm->xhtml || jm->body)
151 serv_got_chat_in(jm->js->gc, chat->id, jabber_get_resource(jm->from),
152 0, jm->xhtml ? jm->xhtml : jm->body, jm->sent);
151 jabber_id_free(jid); 153 jabber_id_free(jid);
152 } 154 }
153 155
154 static void handle_groupchat_invite(JabberMessage *jm) 156 static void handle_groupchat_invite(JabberMessage *jm)
155 { 157 {