# HG changeset patch
# User Ka-Hing Cheung <khc@hxbc.us>
# Date 1193376254 0
# Node ID f710e48fbe1b57fa5c0f6f33800343a5a53352b3
# Parent  abd768f06e7bcbf7cf5cc0d7a7edbb4f08b694fe# Parent  f119cd1cb47cd52392404dbaa4ef57432dd1124c
merge of '5d1f7fb3ad5d13827b161c3d115fb82e9826fe2c'
     and 'd275feb891040092b840d7cc48797e0a16e8a757'

diff -r f119cd1cb47c -r f710e48fbe1b libpurple/protocols/yahoo/yahoo_aliases.c
--- a/libpurple/protocols/yahoo/yahoo_aliases.c	Fri Oct 26 05:10:16 2007 +0000
+++ b/libpurple/protocols/yahoo/yahoo_aliases.c	Fri Oct 26 05:24:14 2007 +0000
@@ -139,8 +139,8 @@
 {
 	struct yahoo_data *yd = gc->proto_data;
 	struct callback_data *cb;
-	char *url, *request, *webpage, *webaddress, *strtmp;
-	int inttmp;
+	const char *url = YAHOO_ALIAS_FETCH_URL;
+	char *request, *webpage, *webaddress;
 	PurpleUtilFetchUrlData *url_data;
 
 	/* Using callback_data so I have access to gc in the callback function */
@@ -148,8 +148,7 @@
 	cb->gc = gc;
 
 	/*  Build all the info to make the web request */
-	url = g_strdup(YAHOO_ALIAS_FETCH_URL);
-	purple_url_parse(url, &webaddress, &inttmp, &webpage, &strtmp, &strtmp);
+	purple_url_parse(url, &webaddress, NULL, &webpage, NULL, NULL);
 	request = g_strdup_printf("GET /%s HTTP/1.1\r\n"
 				 "User-Agent: Mozilla/4.0 (compatible; MSIE 5.5)\r\n"
 				 "Cookie: T=%s; Y=%s\r\n"
@@ -163,7 +162,8 @@
 		yd->url_datas = g_slist_prepend(yd->url_datas, url_data);
 	}
 
-	g_free(url);
+	g_free(webaddress);
+	g_free(webpage);
 	g_free(request);
 }