Mercurial > pidgin.yaz
changeset 27964:d3871a303c6c
adapted to jp separation.
| author | Yoshiki Yazawa <yaz@honeyplanet.jp> |
|---|---|
| date | Tue, 07 Jul 2009 08:25:02 +0000 |
| parents | 85fa979b08c2 |
| children | 79d0779f67f9 |
| files | libpurple/protocols/yahoo/libyahoo.c libpurple/protocols/yahoo/libyahoojp.c libpurple/protocols/yahoo/ycht.h |
| diffstat | 3 files changed, 9 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/yahoo/libyahoo.c Tue Jul 07 06:09:35 2009 +0000 +++ b/libpurple/protocols/yahoo/libyahoo.c Tue Jul 07 08:25:02 2009 +0000 @@ -32,6 +32,7 @@ #include "yahoo_doodle.h" #include "yahoo_filexfer.h" #include "yahoo_picture.h" +#include "ycht.h" static PurplePlugin *my_protocol = NULL; @@ -327,8 +328,6 @@ option = purple_account_option_string_new(_("Encoding"), "local_charset", "UTF-8"); 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); @@ -337,7 +336,6 @@ 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();
--- a/libpurple/protocols/yahoo/libyahoojp.c Tue Jul 07 06:09:35 2009 +0000 +++ b/libpurple/protocols/yahoo/libyahoojp.c Tue Jul 07 08:25:02 2009 +0000 @@ -31,6 +31,7 @@ #include "yahoo_doodle.h" #include "yahoo_filexfer.h" #include "yahoo_picture.h" +#include "ycht.h" static void yahoojp_register_commands(void) { @@ -223,17 +224,14 @@ option = purple_account_option_string_new(_("Encoding"), "local_charset", "UTF-8"); 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); + 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", YAHOO_YCHT_HOST); + 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", YAHOO_YCHT_PORT); + 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();
--- a/libpurple/protocols/yahoo/ycht.h Tue Jul 07 06:09:35 2009 +0000 +++ b/libpurple/protocols/yahoo/ycht.h Tue Jul 07 08:25:02 2009 +0000 @@ -32,6 +32,10 @@ #define YAHOO_YCHT_HOST "jcs3.chat.dcn.yahoo.com" #define YAHOO_YCHT_PORT 8002 +/* fix these --yaz */ +#define YAHOOJP_YCHT_HOST "chat.yahoo.co.jp" +#define YAHOOJP_YCHT_PORT 8000 + #define YCHT_VERSION (0xae) #define YCHT_HEADER_LEN (0x10)