Mercurial > pidgin

changeset 31677:835ea8811734

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge of '3dbc4e50c575de418e1df8f965957b195aeff2ca' and '8e560053e153f10e0b7a2d211f7c20fbe7a2328d'
author Paul Aurich <paul@darkrain42.org>
date Mon, 20 Jun 2011 06:07:38 +0000
parents 5166e76265ae (current diff) 7eeaf38e27b0 (diff)
children 8c7d9c75bd2e 5e173ccbfdb8 92ab45c1758a
files
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/account.c	Mon Jun 20 05:53:59 2011 +0000
+++ b/libpurple/account.c	Mon Jun 20 06:07:38 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;
 }