# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1298168523 0
# Node ID 05c45d8f2ce3c7a36fe5e46af0ba8e9d2b5fbac2
# Parent  43f661bc82ed6c9ccceb8849085e4f85c768b30d
jabber: Use a straight equality check instead of collate

diff -r 43f661bc82ed -r 05c45d8f2ce3 libpurple/protocols/jabber/jabber.c
--- a/libpurple/protocols/jabber/jabber.c	Fri Feb 18 07:51:43 2011 +0000
+++ b/libpurple/protocols/jabber/jabber.c	Sun Feb 20 02:22:03 2011 +0000
@@ -2619,6 +2619,7 @@
 			if(!(server = g_hash_table_lookup(components, "server")))
 				continue;
 
+			/* FIXME: Collate is wrong in a few cases here; this should be prepped */
 			if(jid->node && jid->domain &&
 					!g_utf8_collate(room, jid->node) && !g_utf8_collate(server, jid->domain)) {
 				jabber_id_free(jid);
diff -r 43f661bc82ed -r 05c45d8f2ce3 libpurple/protocols/jabber/presence.c
--- a/libpurple/protocols/jabber/presence.c	Fri Feb 18 07:51:43 2011 +0000
+++ b/libpurple/protocols/jabber/presence.c	Sun Feb 20 02:22:03 2011 +0000
@@ -661,7 +661,7 @@
 			return FALSE;
 		}
 
-		is_our_resource = (0 == g_utf8_collate(presence->jid_from->resource, chat->handle));
+		is_our_resource = g_str_equal(presence->jid_from->resource, chat->handle);
 
 		jabber_buddy_remove_resource(presence->jb, presence->jid_from->resource);
 
@@ -691,6 +691,7 @@
 					if (g_str_equal(presence->jid_from->resource, chat->handle)) {
 						/* Changing our own nickname */
 						g_free(chat->handle);
+						/* TODO: This should be resourceprep'd */
 						chat->handle = g_strdup(nick);
 					}