# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1255656445 0
# Node ID fd495ede2f3aea9261d44c3139118b0ad79ea868
# Parent  a020c6abc8520f1276881f703a3226ca42ed169f# Parent  583a2f6ae5760ca0ea4c4fbbf86711176946f55e
merge of '33ac448c0d0fbe2bd41ad24c9d2e8faa14fafa69'
     and '8868b966ec81185b033adaf17af1a06143d2edb1'

diff -r a020c6abc852 -r fd495ede2f3a libpurple/ft.h
--- a/libpurple/ft.h	Thu Oct 15 23:48:54 2009 +0000
+++ b/libpurple/ft.h	Fri Oct 16 01:27:25 2009 +0000
@@ -674,7 +674,7 @@
 void purple_xfer_ui_ready(PurpleXfer *xfer);
 
 /**
- * Allows the prpl to signal it's readh to send/receive data (depending on
+ * Allows the prpl to signal it's ready to send/receive data (depending on
  * the direction of the file transfer. Used when the prpl provides read/write
  * ops and cannot/does not provide a raw fd to the core.
  *
diff -r a020c6abc852 -r fd495ede2f3a libpurple/protocols/jabber/chat.c
--- a/libpurple/protocols/jabber/chat.c	Thu Oct 15 23:48:54 2009 +0000
+++ b/libpurple/protocols/jabber/chat.c	Fri Oct 16 01:27:25 2009 +0000
@@ -106,7 +106,7 @@
 	{
 		char *room_jid = g_strdup_printf("%s@%s", room, server);
 
-		chat = g_hash_table_lookup(js->chats, jabber_normalize(NULL, room_jid));
+		chat = g_hash_table_lookup(js->chats, room_jid);
 		g_free(room_jid);
 	}
 
@@ -373,7 +373,7 @@
 	JabberStream *js = chat->js;
 	char *room_jid = g_strdup_printf("%s@%s", chat->room, chat->server);
 
-	g_hash_table_remove(js->chats, jabber_normalize(NULL, room_jid));
+	g_hash_table_remove(js->chats, room_jid);
 	g_free(room_jid);
 }
 
diff -r a020c6abc852 -r fd495ede2f3a libpurple/protocols/jabber/chat.h
--- a/libpurple/protocols/jabber/chat.h	Thu Oct 15 23:48:54 2009 +0000
+++ b/libpurple/protocols/jabber/chat.h	Fri Oct 16 01:27:25 2009 +0000
@@ -62,6 +62,8 @@
  * in-prpl function for joining a chat room. Doesn't require sticking goop
  * into a hash table.
  *
+ * @param room     The room to join. This MUST be normalized already.
+ * @param server   The server the room is on. This MUST be normalized already.
  * @param password The password (if required) to join the room. May be NULL.
  * @param data     The chat hash table.  May be NULL (it will be generated
  *                 for current core<>prpl API interface.)