Mercurial > pidgin

comparison libpurple/protocols/yahoo/libyahoojp.c @ 28044:74958cad186d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 2cb6ea4420a0
comparison
equal deleted inserted replaced
28043:abdca180a897 28044:74958cad186d
215 prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option); 215 prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
216 216
217 option = purple_account_option_string_new(_("Chat room locale"), "room_list_locale", YAHOOJP_ROOMLIST_LOCALE); 217 option = purple_account_option_string_new(_("Chat room locale"), "room_list_locale", YAHOOJP_ROOMLIST_LOCALE);
218 prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option); 218 prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
219 219
220 option = purple_account_option_string_new(_("Encoding"), "local_charset", "UTF-8");
221 prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
222
220 option = purple_account_option_bool_new(_("Ignore conference and chatroom invitations"), "ignore_invites", FALSE); 223 option = purple_account_option_bool_new(_("Ignore conference and chatroom invitations"), "ignore_invites", FALSE);
221 prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option); 224 prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
222 225
223 option = purple_account_option_string_new(_("Encoding"), "local_charset", "UTF-8"); 226 option = purple_account_option_bool_new(_("Use account proxy for SSL connections"), "proxy_ssl", FALSE);
224 prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option); 227 prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
225
226 228
227 #if 0 229 #if 0
228 option = purple_account_option_string_new(_("Chat room list URL"), "room_list", YAHOO_ROOMLIST_URL); 230 option = purple_account_option_string_new(_("Chat room list URL"), "room_list", YAHOO_ROOMLIST_URL);
229 prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option); 231 prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
230 232