# HG changeset patch # User Sadrul Habib Chowdhury # Date 1196934778 0 # Node ID 93b5df5b5d1ccd02dfa78f78e65504ad0b679f2d # Parent 3827b1442a73ce66c090d3e8f9260ae9eba32c69 Normalize the names appropriately when searching for accounts. This should allow finding accounts with the same username but different resources in jabber. References #2049. diff -r 3827b1442a73 -r 93b5df5b5d1c libpurple/account.c --- a/libpurple/account.c Thu Dec 06 08:10:46 2007 +0000 +++ b/libpurple/account.c Thu Dec 06 09:52:58 2007 +0000 @@ -2529,22 +2529,19 @@ g_return_val_if_fail(name != NULL, NULL); - who = g_strdup(purple_normalize(NULL, name)); - for (l = purple_accounts_get_all(); l != NULL; l = l->next) { account = (PurpleAccount *)l->data; - if (!strcmp(purple_normalize(NULL, purple_account_get_username(account)), who) && + who = g_strdup(purple_normalize(account, name)); + if (!strcmp(purple_normalize(account, purple_account_get_username(account)), who) && (!protocol_id || !strcmp(account->protocol_id, protocol_id))) { - + g_free(who); break; } - + g_free(who); account = NULL; } - g_free(who); - return account; }