Mercurial > pidgin.yaz

comparison libpurple/protocols/yahoo/libyahoo.c @ 28394: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 4a2adf413aaa 7b88cc6c3f7a
comparison
equal deleted inserted replaced
28393:abdca180a897 28394:74958cad186d
319 prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option); 319 prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
320 320
321 option = purple_account_option_string_new(_("Chat room locale"), "room_list_locale", YAHOO_ROOMLIST_LOCALE); 321 option = purple_account_option_string_new(_("Chat room locale"), "room_list_locale", YAHOO_ROOMLIST_LOCALE);
322 prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option); 322 prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
323 323
324 option = purple_account_option_string_new(_("Encoding"), "local_charset", "UTF-8");
325 prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
326
324 option = purple_account_option_bool_new(_("Ignore conference and chatroom invitations"), "ignore_invites", FALSE); 327 option = purple_account_option_bool_new(_("Ignore conference and chatroom invitations"), "ignore_invites", FALSE);
325 prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option); 328 prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
326 329
327 option = purple_account_option_string_new(_("Encoding"), "local_charset", "UTF-8"); 330 option = purple_account_option_bool_new(_("Use account proxy for SSL connections"), "proxy_ssl", FALSE);
328 prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option); 331 prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
329
330 332
331 #if 0 333 #if 0
332 option = purple_account_option_string_new(_("Chat room list URL"), "room_list", YAHOO_ROOMLIST_URL); 334 option = purple_account_option_string_new(_("Chat room list URL"), "room_list", YAHOO_ROOMLIST_URL);
333 prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option); 335 prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
334 336