diff libpurple/protocols/yahoo/yahoo_aliases.c @ 23986:18a1f0fe5f40

Do a better job of detecting if the yahoo account is connecting through a HTTP Proxy in order to generate acceptable HTTP requests. Hopefully fixes #6527
author Daniel Atallah <daniel.atallah@gmail.com>
date Wed, 27 Aug 2008 02:52:50 +0000
parents adbcf5b84438
children c0226e400836
line wrap: on
line diff
--- a/libpurple/protocols/yahoo/yahoo_aliases.c	Wed Aug 27 02:43:25 2008 +0000
+++ b/libpurple/protocols/yahoo/yahoo_aliases.c	Wed Aug 27 02:52:50 2008 +0000
@@ -155,12 +155,8 @@
 	gchar *request, *webpage, *webaddress;
 	PurpleUtilFetchUrlData *url_data;
 
-	gboolean use_whole_url = FALSE;
-
 	/* use whole URL if using HTTP Proxy */
-	if ((gc->account->proxy_info)
-	    && (gc->account->proxy_info->type == PURPLE_PROXY_HTTP))
-		use_whole_url = TRUE;
+	gboolean use_whole_url = yahoo_account_use_http_proxy(gc);
 
 	/* Using callback_data so I have access to gc in the callback function */
 	cb = g_new0(struct callback_data, 1);
@@ -266,13 +262,9 @@
 	gchar *content, *request, *webpage, *webaddress;
 	struct callback_data *cb;
 	PurpleUtilFetchUrlData *url_data;
-	gboolean use_whole_url = FALSE;
 	YahooFriend *f;
-
 	/* use whole URL if using HTTP Proxy */
-	if ((gc->account->proxy_info)
-	    && (gc->account->proxy_info->type == PURPLE_PROXY_HTTP))
-		use_whole_url = TRUE;
+	gboolean use_whole_url = yahoo_account_use_http_proxy(gc);
 
 	g_return_if_fail(who != NULL);
 	g_return_if_fail(gc != NULL);