# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1181491150 0
# Node ID 60bc2827d0e7f4d11f6ebf7e2c84df7a5b0a3566
# Parent  04f1a6da47a296ca3a1a79a5dbc8522de4aad41a# Parent  d495103dcf8839ec48f133e548e7a007ad5a8528
merge of '0e092e2c969ff59e242f866fd69d643b77bad18c'
     and '49fd2d3743c303820668e5566f9513c3a16bca71'

diff -r 04f1a6da47a2 -r 60bc2827d0e7 libpurple/protocols/jabber/libxmpp.c
--- a/libpurple/protocols/jabber/libxmpp.c	Sun Jun 10 15:51:29 2007 +0000
+++ b/libpurple/protocols/jabber/libxmpp.c	Sun Jun 10 15:59:10 2007 +0000
@@ -64,7 +64,7 @@
 	jabber_set_info,				/* set_info */
 	jabber_send_typing,				/* send_typing */
 	jabber_buddy_get_info,			/* get_info */
-	jabber_presence_send,			/* set_away */
+	jabber_presence_send,			/* set_status */
 	jabber_idle_set,				/* set_idle */
 	NULL,							/* change_passwd */
 	jabber_roster_add_buddy,		/* add_buddy */
diff -r 04f1a6da47a2 -r 60bc2827d0e7 libpurple/protocols/jabber/presence.c
--- a/libpurple/protocols/jabber/presence.c	Sun Jun 10 15:51:29 2007 +0000
+++ b/libpurple/protocols/jabber/presence.c	Sun Jun 10 15:59:10 2007 +0000
@@ -608,7 +608,7 @@
 				formatted_msg = NULL;
 
 			if(formatted_msg)
-				purple_markup_html_to_xhtml(formatted_msg, NULL, msg);
+				*msg = purple_markup_strip_html(formatted_msg);
 		}
 
 		if(priority)