Mercurial > pidgin.yaz
changeset 31678:05c45d8f2ce3
jabber: Use a straight equality check instead of collate
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Sun, 20 Feb 2011 02:22:03 +0000 |
| parents | 43f661bc82ed |
| children | ba6a4a0f8f50 |
| files | libpurple/protocols/jabber/jabber.c libpurple/protocols/jabber/presence.c |
| diffstat | 2 files changed, 3 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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);
--- 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); }