Mercurial > pidgin.yaz
diff libpurple/protocols/yahoo/libyahoo.c @ 28394:74958cad186d
Add a boolean account option (defaulting to off) to control whether to use
an account-specific proxy for Yahoo SSL connections. Fixes #9488, I hope.
| author | John Bailey <rekkanoryo@rekkanoryo.org> |
|---|---|
| date | Sat, 22 Aug 2009 02:28:23 +0000 |
| parents | 6d3f3473cb4c |
| children | 4a2adf413aaa 7b88cc6c3f7a |
line wrap: on
line diff
--- a/libpurple/protocols/yahoo/libyahoo.c Sat Aug 22 02:10:21 2009 +0000 +++ b/libpurple/protocols/yahoo/libyahoo.c Sat Aug 22 02:28:23 2009 +0000 @@ -321,13 +321,15 @@ option = purple_account_option_string_new(_("Chat room locale"), "room_list_locale", YAHOO_ROOMLIST_LOCALE); prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option); + option = purple_account_option_string_new(_("Encoding"), "local_charset", "UTF-8"); + prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option); + 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_string_new(_("Encoding"), "local_charset", "UTF-8"); + option = purple_account_option_bool_new(_("Use account proxy for SSL connections"), "proxy_ssl", FALSE); prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option); - #if 0 option = purple_account_option_string_new(_("Chat room list URL"), "room_list", YAHOO_ROOMLIST_URL); prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);