Mercurial > pidgin.yaz
changeset 32132:5166e76265ae
merge of '3a12ece5b629e6de76faec79315514e70ccb32bb'
and '4fdc7756ef147546eab68685a5d86c4b6db44a11'
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Mon, 20 Jun 2011 05:53:59 +0000 |
| parents | 1d657ec53cdb (diff) 2d703748870f (current diff) |
| children | 835ea8811734 5847a4c212f0 |
| files | |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/account.c Mon Jun 20 04:59:17 2011 +0000 +++ b/libpurple/account.c Mon Jun 20 05:53:59 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; }