changeset 28386:08ffa726aea2

jabber: Remove useless jabber_normalize calls now that the data in the hash table is normalized.
author Paul Aurich <paul@darkrain42.org>
date Thu, 15 Oct 2009 16:25:09 +0000
parents d5ff2cd6064a
children 583a2f6ae576
files libpurple/protocols/jabber/chat.c libpurple/protocols/jabber/chat.h
diffstat 2 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/protocols/jabber/chat.c	Thu Oct 15 16:13:57 2009 +0000
+++ b/libpurple/protocols/jabber/chat.c	Thu Oct 15 16:25:09 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);
 }
 
--- a/libpurple/protocols/jabber/chat.h	Thu Oct 15 16:13:57 2009 +0000
+++ b/libpurple/protocols/jabber/chat.h	Thu Oct 15 16:25:09 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.)