# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1270352536 0
# Node ID 97e3a0bc963c11d91240c9592125331fb28da2d6
# Parent  4839a889f7053dd0a2991e435819ed0002be7c21# Parent  701eb26db9900441fb96f83ab16aeefe82dc4147
merge of 'd1c4d12dd8688b70e83685148987b40e2bef1f9b'
     and 'f93594a81b0e180378f83d1a964c014fc2d8ae99'

diff -r 4839a889f705 -r 97e3a0bc963c libpurple/protocols/yahoo/libyahoo.c
--- a/libpurple/protocols/yahoo/libyahoo.c	Sun Apr 04 03:40:58 2010 +0000
+++ b/libpurple/protocols/yahoo/libyahoo.c	Sun Apr 04 03:42:16 2010 +0000
@@ -331,12 +331,6 @@
 #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);
-
-	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;
diff -r 4839a889f705 -r 97e3a0bc963c libpurple/protocols/yahoo/libyahoojp.c
--- a/libpurple/protocols/yahoo/libyahoojp.c	Sun Apr 04 03:40:58 2010 +0000
+++ b/libpurple/protocols/yahoo/libyahoojp.c	Sun Apr 04 03:42:16 2010 +0000
@@ -227,12 +227,6 @@
 #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);
-
-	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
 
 	yahoojp_register_commands();
diff -r 4839a889f705 -r 97e3a0bc963c libpurple/protocols/yahoo/libymsg.c
--- a/libpurple/protocols/yahoo/libymsg.c	Sun Apr 04 03:40:58 2010 +0000
+++ b/libpurple/protocols/yahoo/libymsg.c	Sun Apr 04 03:42:16 2010 +0000
@@ -1736,6 +1736,8 @@
 				244, yd->jp ? YAHOOJP_CLIENT_VERSION_ID : YAHOO_CLIENT_VERSION_ID,
 				2, name,
 				2, "1",
+				/* Should send key 59, value of bcookie here--need to fetch it first! */
+				98, purple_account_get_string(account, "room_list_locale", yd->jp ? "jp" : "us"),
 				135, yd->jp ? YAHOOJP_CLIENT_VERSION : YAHOO_CLIENT_VERSION);
 
 	if (yd->picture_checksum)
@@ -3529,7 +3531,7 @@
 		purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
 				_("Unable to connect: The server returned an empty response."));
 	} else {
-		strings = g_strsplit(url_text, "\n", -1);
+		strings = g_strsplit(url_text, "\r\n", -1);
 
 		if((stringslen = g_strv_length(strings)) > 1) {
 			int i;