# HG changeset patch
# User Nathan Walp <nwalp@pidgin.im>
# Date 1080758226 0
# Node ID dc818b62379e18668cb5daf80d77b84f960826de
# Parent  008e4576dbfc97dd3c40130e3fe8e20d8c1ae1b7
[gaim-migrate @ 9276]
jabber fixination

committer: Tailor Script <tailor@pidgin.im>

diff -r 008e4576dbfc -r dc818b62379e src/protocols/jabber/chat.c
--- a/src/protocols/jabber/chat.c	Wed Mar 31 15:51:31 2004 +0000
+++ b/src/protocols/jabber/chat.c	Wed Mar 31 18:37:06 2004 +0000
@@ -572,7 +572,8 @@
 	char *room_jid;
 	xmlnode *presence;
 
-	room_jid = g_strdup_printf("%s@%s", chat->room, chat->server);
+	room_jid = g_strdup_printf("%s@%s/%s", chat->room, chat->server,
+			chat->handle);
 	presence = xmlnode_new("presence");
 	xmlnode_set_attrib(presence, "to", room_jid);
 	xmlnode_set_attrib(presence, "type", "unavailable");
diff -r 008e4576dbfc -r dc818b62379e src/protocols/jabber/message.c
--- a/src/protocols/jabber/message.c	Wed Mar 31 15:51:31 2004 +0000
+++ b/src/protocols/jabber/message.c	Wed Mar 31 18:37:06 2004 +0000
@@ -195,6 +195,7 @@
 {
 	GHashTable *components;
 	JabberID *jid = jabber_id_new(jm->to);
+	char *stripped;
 
 	if(!jid)
 		return;
@@ -209,7 +210,9 @@
 			g_strdup(jm->password));
 
 	jabber_id_free(jid);
-	serv_got_chat_invite(jm->js->gc, jm->to, jm->from, jm->body, components);
+	stripped = gaim_markup_strip_html(jm->body);
+	serv_got_chat_invite(jm->js->gc, jm->to, jm->from, stripped, components);
+	g_free(stripped);
 }
 
 static void handle_error(JabberMessage *jm)