Mercurial > pidgin.yaz

diff libpurple/protocols/yahoo/yahoo_aliases.c @ 26237:eb21f65728c0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
propagate from branch 'im.pidgin.pidgin' (head bc80dc424bc7a7e274901f9124173538e5b43f41) to branch 'im.pidgin.soc.2008.yahoo' (head 42700e96e9188523e8d99406abde695abf97caf5)
author Sulabh Mahajan <sulabh@soc.pidgin.im>
date Wed, 12 Nov 2008 10:18:49 +0000
parents 18a1f0fe5f40
children c0226e400836
line wrap: on
line diff
--- a/libpurple/protocols/yahoo/yahoo_aliases.c	Wed Nov 12 10:17:38 2008 +0000
+++ b/libpurple/protocols/yahoo/yahoo_aliases.c	Wed Nov 12 10:18:49 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);