pidgin: 06fcbcb8: Change the function of the "proxy_ssl" a...

[rekkanoryo at pidgin.im]

-----------------------------------------------------------------
Revision: 06fcbcb8d044bcd6887415dc87274071bb724596
Ancestor: 8138501adc82bed07f319a032075157923e0cb9b
Author: rekkanoryo at pidgin.im
Date: 2010-06-12T02:41:35
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/06fcbcb8d044bcd6887415dc87274071bb724596

Modified files:
        libpurple/protocols/yahoo/libyahoo.c
        libpurple/protocols/yahoo/libyahoojp.c
        libpurple/protocols/yahoo/libymsg.c

ChangeLog: 

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.

-------------- next part --------------
============================================================
--- libpurple/protocols/yahoo/libyahoo.c	3b665fc43ba5773de00087dac573cf7c9dd1d8b0
+++ libpurple/protocols/yahoo/libyahoo.c	875b38564e0465d1d3f278991eb20e9cc118127e
@@ -327,7 +327,7 @@ init_plugin(PurplePlugin *plugin)
 	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
============================================================
--- libpurple/protocols/yahoo/libyahoojp.c	404dee90b563851004f718d5e2dd502b0ef81613
+++ libpurple/protocols/yahoo/libyahoojp.c	3a6cf95dce97904c0262b7e9401fda5e4460913f
@@ -223,7 +223,7 @@ init_plugin(PurplePlugin *plugin)
 	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
============================================================
--- libpurple/protocols/yahoo/libymsg.c	a78b9b5fa500695a7250aa0b14f0f20273471b2c
+++ libpurple/protocols/yahoo/libymsg.c	10e1f954fa17346bfe6febf9f63e94fad26de543
@@ -3644,6 +3644,7 @@ void yahoo_login(PurpleAccount *account)
 	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 @@ void yahoo_login(PurpleAccount *account)
 	/* 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,