diff options
| author | John Bailey <rekkanoryo@rekkanoryo.org> | 2010-06-12 02:41:35 +0000 |
|---|---|---|
| committer | John Bailey <rekkanoryo@rekkanoryo.org> | 2010-06-12 02:41:35 +0000 |
| commit | 38742d23fcbe0f2cba40a0b0bf33efffef7b4307 (patch) | |
| tree | 46a6dfebe49bf20020a0ec3f122156293d07f94e /libpurple/protocols | |
| parent | 0cf1928b9973cb30f54c0aa897924fe2ef4fde71 (diff) | |
| download | pidgin-38742d23fcbe0f2cba40a0b0bf33efffef7b4307.tar.gz | |
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.
Diffstat (limited to 'libpurple/protocols')
| -rw-r--r-- | libpurple/protocols/yahoo/libyahoo.c | 2 | ||||
| -rw-r--r-- | libpurple/protocols/yahoo/libyahoojp.c | 2 | ||||
| -rw-r--r-- | libpurple/protocols/yahoo/libymsg.c | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/libpurple/protocols/yahoo/libyahoo.c b/libpurple/protocols/yahoo/libyahoo.c index 08448e8269..a3871e1a72 100644 --- a/libpurple/protocols/yahoo/libyahoo.c +++ b/libpurple/protocols/yahoo/libyahoo.c @@ -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 diff --git a/libpurple/protocols/yahoo/libyahoojp.c b/libpurple/protocols/yahoo/libyahoojp.c index 7c5c4f3153..a7342f6bf9 100644 --- a/libpurple/protocols/yahoo/libyahoojp.c +++ b/libpurple/protocols/yahoo/libyahoojp.c @@ -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 diff --git a/libpurple/protocols/yahoo/libymsg.c b/libpurple/protocols/yahoo/libymsg.c index 99a25a2b8c..d2e0e9c668 100644 --- a/libpurple/protocols/yahoo/libymsg.c +++ b/libpurple/protocols/yahoo/libymsg.c @@ -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, |