# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1308550066 0
# Node ID 5e173ccbfdb8807501d0a2736a0e3b43eff9151b
# Parent  835ea8811734c853c2dc8756e0944cf96f676a36# Parent  5847a4c212f0615f73a190c2c3e302d39f9a8a01
propagate from branch 'im.pidgin.pidgin' (head 9fc56c5e4669dbbaa42a495b831982f2732e3895)
            to branch 'im.pidgin.pidgin.next.minor' (head dd54e7e72c5e675287d7c897baa9b075df14e4c9)

diff -r 5847a4c212f0 -r 5e173ccbfdb8 libpurple/account.c
--- a/libpurple/account.c	Mon Jun 20 06:03:12 2011 +0000
+++ b/libpurple/account.c	Mon Jun 20 06:07:46 2011 +0000
@@ -3038,19 +3038,19 @@
 	g_return_val_if_fail(name != NULL, NULL);
 	g_return_val_if_fail(protocol_id != NULL, NULL);
 
-	who = g_strdup(purple_normalize(account, name));
 	for (l = purple_accounts_get_all(); l != NULL; l = l->next) {
 		account = (PurpleAccount *)l->data;
 		if (!purple_strequal(account->protocol_id, protocol_id))
 			continue;
 
+		who = g_strdup(purple_normalize(account, name));
 		if (purple_strequal(purple_normalize(account, purple_account_get_username(account)), who)) {
 			g_free(who);
 			return account;
 		}
+		g_free(who);
 	}
 
-	g_free(who);
 	return NULL;
 }