Mercurial > pidgin

comparison libpurple/protocols/yahoo/libyahoo.c @ 30176:27aff21c5eea

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author John Bailey <rekkanoryo@rekkanoryo.org>
date Sat, 12 Jun 2010 02:41:35 +0000
parents 2a436e0ce977
children 7c33eaed54e5
comparison
equal deleted inserted replaced
30175:fc8f98d1e81f 30176:27aff21c5eea
325 prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option); 325 prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
326 326
327 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);
328 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);
329 329
330 option = purple_account_option_bool_new(_("Use account proxy for SSL connections"), "proxy_ssl", FALSE); 330 option = purple_account_option_bool_new(_("Use account proxy for HTTP and HTTPS connections"), "proxy_ssl", FALSE);
331 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);
332 332
333 #if 0 333 #if 0
334 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);
335 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);