comparison libpurple/account.c @ 21792:f5d8acf1c5f4

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

21791:c80d0732fa40

	GList *l;
	char *who;

	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) &&
			(!protocol_id || !strcmp(account->protocol_id, protocol_id))) {

			break;
		}

		account = NULL;
	}

	g_free(who);

	return account;
}

void

21792:f5d8acf1c5f4

	GList *l;
	char *who;

	g_return_val_if_fail(name != NULL, NULL);

	for (l = purple_accounts_get_all(); l != NULL; l = l->next) {
		account = (PurpleAccount *)l->data;

		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;
	}

	return account;
}

void