Mercurial > pidgin.yaz

changeset 7135:eba5f7be0bc8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 7702] i think we're allowed to send XHTML to groupchats. if anyone can find a definitive answer about this, lemme know. committer: Tailor Script <tailor@pidgin.im>
author Nathan Walp <nwalp@pidgin.im>
date Fri, 03 Oct 2003 23:14:13 +0000
parents 67f9b43c402a
children 2b99c950b817
files src/protocols/jabber/message.c
diffstat 1 files changed, 3 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/protocols/jabber/message.c	Fri Oct 03 23:01:13 2003 +0000
+++ b/src/protocols/jabber/message.c	Fri Oct 03 23:14:13 2003 +0000
@@ -332,7 +332,7 @@
 	JabberBuddy *jb;
 	JabberBuddyResource *jbr;
 	char *buf;
-	char *xhtml, *plain;
+	char *xhtml;
 
 	if(!who || !msg)
 		return 0;
@@ -348,10 +348,9 @@
 
 	buf = g_strdup_printf("<html xmlns='http://jabber.org/protocol/xhtml-im'><body>%s</body></html>", msg);
 
-	gaim_markup_html_to_xhtml(buf, &xhtml, &plain);
+	gaim_markup_html_to_xhtml(buf, &xhtml, &jm->body);
 	g_free(buf);
 
-	jm->body = plain;
 	if(!jbr || jbr->capabilities & JABBER_CAP_XHTML)
 		jm->xhtml = xhtml;
 	else
@@ -378,7 +377,7 @@
 	jm->type = JABBER_MESSAGE_CHAT;
 	jm->to = g_strdup_printf("%s@%s", chat->room, chat->server);
 
-	gaim_markup_html_to_xhtml(message, NULL, &jm->body);
+	gaim_markup_html_to_xhtml(message, &jm->xhtml, &jm->body);
 
 	jabber_message_send(jm);
 	jabber_message_free(jm);