# HG changeset patch
# User John Bailey <rekkanoryo@rekkanoryo.org>
# Date 1276310495 0
# Node ID 27aff21c5eea7cb1efe31ad607e884c5de01dd5e
# Parent  fc8f98d1e81f28eb20421f02caa07d775ab777ec
Change the function of the "proxy_ssl" account option to cover regular HTTP
requests as well as HTTPS requests.  While this does fix the core issue of
#11986, there is still more that I need to do to fix his issue.  Refs #11986.

diff -r fc8f98d1e81f -r 27aff21c5eea libpurple/protocols/yahoo/libyahoo.c
--- a/libpurple/protocols/yahoo/libyahoo.c	Thu Jun 10 20:35:08 2010 +0000
+++ b/libpurple/protocols/yahoo/libyahoo.c	Sat Jun 12 02:41:35 2010 +0000
@@ -327,7 +327,7 @@
 	option = purple_account_option_bool_new(_("Ignore conference and chatroom invitations"), "ignore_invites", FALSE);
 	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 
-	option = purple_account_option_bool_new(_("Use account proxy for SSL connections"), "proxy_ssl", FALSE);
+	option = purple_account_option_bool_new(_("Use account proxy for HTTP and HTTPS connections"), "proxy_ssl", FALSE);
 	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 
 #if 0
diff -r fc8f98d1e81f -r 27aff21c5eea libpurple/protocols/yahoo/libyahoojp.c
--- a/libpurple/protocols/yahoo/libyahoojp.c	Thu Jun 10 20:35:08 2010 +0000
+++ b/libpurple/protocols/yahoo/libyahoojp.c	Sat Jun 12 02:41:35 2010 +0000
@@ -223,7 +223,7 @@
 	option = purple_account_option_bool_new(_("Ignore conference and chatroom invitations"), "ignore_invites", FALSE);
 	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 
-	option = purple_account_option_bool_new(_("Use account proxy for SSL connections"), "proxy_ssl", FALSE);
+	option = purple_account_option_bool_new(_("Use account proxy for HTTP and HTTPS connections"), "proxy_ssl", FALSE);
 	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 
 #if 0
diff -r fc8f98d1e81f -r 27aff21c5eea libpurple/protocols/yahoo/libymsg.c
--- a/libpurple/protocols/yahoo/libymsg.c	Thu Jun 10 20:35:08 2010 +0000
+++ b/libpurple/protocols/yahoo/libymsg.c	Sat Jun 12 02:41:35 2010 +0000
@@ -3644,6 +3644,7 @@
 	YahooData *yd = gc->proto_data = g_new0(YahooData, 1);
 	PurpleStatus *status = purple_account_get_active_status(account);
 	gboolean use_whole_url = yahoo_account_use_http_proxy(gc);
+	gboolean proxy_ssl = purple_account_get_bool(account, "proxy_ssl", FALSE);
 	PurpleUtilFetchUrlData *url_data;
 
 	gc->flags |= PURPLE_CONNECTION_HTML | PURPLE_CONNECTION_NO_BGCOLOR | PURPLE_CONNECTION_NO_URLDESC;
@@ -3678,7 +3679,7 @@
 	/* Get the pager server.  Actually start connecting in the callback since we
 	 * must have the contents of the HTTP response to proceed. */
 	url_data = purple_util_fetch_url_request_len_with_account(
-			purple_connection_get_account(gc),
+			proxy_ssl ? purple_connection_get_account(gc) : NULL,
 			yd->jp ? YAHOOJP_PAGER_HOST_REQ_URL : YAHOO_PAGER_HOST_REQ_URL,
 			use_whole_url ? TRUE : FALSE,
 			YAHOO_CLIENT_USERAGENT, TRUE, NULL, FALSE, -1,