Normalize the names appropriately when searching for accounts. This should

Thu, 06 Dec 2007 09:52:58 +0000

author
Sadrul Habib Chowdhury <sadrul@pidgin.im>
date
Thu, 06 Dec 2007 09:52:58 +0000
changeset 21907
93b5df5b5d1c
parent 21906
3827b1442a73
child 21908
0e933a80c8fd

Normalize the names appropriately when searching for accounts. This should
allow finding accounts with the same username but different resources in jabber.
References #2049.

libpurple/account.c file | annotate | diff | comparison | revisions
--- 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;
 }
 

mercurial