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/yahoo/libyahoo.c | |
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/yahoo/libyahoo.c')
-rw-r--r-- | libpurple/protocols/yahoo/libyahoo.c | 2 |
1 files changed, 1 insertions, 1 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 |