Mercurial > pidgin
changeset 29678:6cfc9cf2e8cc
merge of '2ac9476396460f68ab147a035f4083121aec9972'
and '3ef9bbfad62576f3db5044c28101c08446179946'
| author | John Bailey <rekkanoryo@rekkanoryo.org> |
|---|---|
| date | Sun, 04 Apr 2010 02:09:19 +0000 |
| parents | c7bfe4f1358e (current diff) 7081cefdd61a (diff) |
| children | 701eb26db990 |
| files | |
| diffstat | 1 files changed, 3 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/yahoo/libymsg.c Sun Apr 04 00:27:15 2010 +0000 +++ b/libpurple/protocols/yahoo/libymsg.c Sun Apr 04 02:09:19 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;