# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1280694177 0
# Node ID 94f8a42e529b893f03c9a191ad65af84a8276ce9
# Parent  06d8de5dd53cc17f1ddb9569d7d7cac77e04ba92# Parent  22a2b982ae6591f2132e4b9134f2da5507349fc9
merge of '9655e74ffa6d13bf9ad73bdbd432f003c33cae79'
     and 'e44423f9da531d77c6bc71cbb54f5a9ffc2e1a18'

diff -r 22a2b982ae65 -r 94f8a42e529b libpurple/protocols/yahoo/libymsg.c
--- a/libpurple/protocols/yahoo/libymsg.c	Sun Aug 01 14:27:26 2010 +0000
+++ b/libpurple/protocols/yahoo/libymsg.c	Sun Aug 01 20:22:57 2010 +0000
@@ -2702,6 +2702,7 @@
 	PurpleAccount *account;
 	YahooData *yd = gc->proto_data;
 	struct yahoo_p2p_data *p2p_data;
+	const char *norm_username;
 
 	f = yahoo_friend_find(gc, who);
 	account = purple_connection_get_account(gc);
@@ -2734,10 +2735,11 @@
 	sprintf(temp_str, "%d", ip);
 	base64_ip = purple_base64_encode( (guchar *)temp_str, strlen(temp_str) );
 
+	norm_username = purple_normalize(account, purple_account_get_username(account));
 	pkt = yahoo_packet_new(YAHOO_SERVICE_PEERTOPEER, YAHOO_STATUS_AVAILABLE, 0);
 	yahoo_packet_hash(pkt, "sssissis",
-		1, purple_normalize(account, purple_account_get_username(account)),
-		4, purple_normalize(account, purple_account_get_username(account)),
+		1, norm_username,
+		4, norm_username,
 		12, base64_ip,	/* base64 encode ip */
 		61, 0,		/* To-do : figure out what is 61 for?? */
 		2, "",