# HG changeset patch # User Yoshiki Yazawa # Date 1270629672 -32400 # Node ID 1f1d58d35746d0faa5e2f341fe5532d252603d36 # Parent 49ffb40f3bcde3ca7d68a54a8b3b7d38f99231a7 revive unexpectedly removed options. diff -r 49ffb40f3bcd -r 1f1d58d35746 libpurple/protocols/yahoo/libyahoo.c --- a/libpurple/protocols/yahoo/libyahoo.c Sun Apr 04 14:22:45 2010 +0900 +++ b/libpurple/protocols/yahoo/libyahoo.c Wed Apr 07 17:41:12 2010 +0900 @@ -329,9 +329,17 @@ 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 1 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); + option = purple_account_option_string_new(_("Yahoo Chat server"), "ycht-server", YAHOO_YCHT_HOST); + prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option); + + option = purple_account_option_int_new(_("Yahoo Chat port"), "ycht-port", YAHOO_YCHT_PORT); + prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option); +#endif + my_protocol = plugin; yahoo_register_commands(); yahoo_init_colorht(); diff -r 49ffb40f3bcd -r 1f1d58d35746 libpurple/protocols/yahoo/libyahoojp.c --- a/libpurple/protocols/yahoo/libyahoojp.c Sun Apr 04 14:22:45 2010 +0900 +++ b/libpurple/protocols/yahoo/libyahoojp.c Wed Apr 07 17:41:12 2010 +0900 @@ -225,9 +225,17 @@ 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 1 option = purple_account_option_string_new(_("Chat room list URL"), "room_list", YAHOOJP_ROOMLIST_URL); prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option); + option = purple_account_option_string_new(_("Yahoo Chat server"), "ycht-server", YAHOOJP_YCHT_HOST); + prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option); + + option = purple_account_option_int_new(_("Yahoo Chat port"), "ycht-port", YAHOOJP_YCHT_PORT); + prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option); +#endif + yahoojp_register_commands(); yahoo_init_colorht(); }