Mercurial > pidgin.yaz
changeset 29130:f8da53e381dd
Improved handling of the 0x00d charset in AIM, which is sent by mobile devices speaking ISO-8859-1. Try UTF-8 first (the encoding sent by iChat in a Direct IM with non-ASCII characters), then fall back to ISO-8859-1. Fixes #a13544, a bug created with the fix for iChat DIM encoding new in libpurple 2.6.4"
applied changes from 6f3a1b3c52803e11d4cda1e0537c1270599e8d8e
through ed0a2a35c7e22519df27c50069c22b03e01c027a
| author | Evan Schoenberg <evan.s@dreskin.net> |
|---|---|
| date | Fri, 04 Dec 2009 02:24:41 +0000 |
| parents | ebb424b7e0a1 |
| children | 819f464e581c fb550b27c6d8 |
| files | libpurple/protocols/oscar/oscar.c |
| diffstat | 1 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/oscar/oscar.c Thu Dec 03 08:02:54 2009 +0000 +++ b/libpurple/protocols/oscar/oscar.c Fri Dec 04 02:24:41 2009 +0000 @@ -457,10 +457,10 @@ charsetstr1 = "ASCII"; charsetstr2 = purple_account_get_string(account, "encoding", OSCAR_DEFAULT_CUSTOM_ENCODING); } else if (charset == 0x000d) { - /* iChat sending unicode over a Direct IM connection = Unicode */ - /* Mobile AIM client on a Nokia 3100 and an LG VX6000 = ISO-8859-1 */ - charsetstr1 = "UTF-16BE"; - charsetstr2 = "UTF-8"; + /* iChat sending unicode over a Direct IM connection = UTF-8 */ + /* Mobile AIM client on multiple devices (including Blackberry Tour, Nokia 3100, and LG VX6000) = ISO-8859-1 */ + charsetstr1 = "UTF-8"; + charsetstr2 = "ISO-8859-1"; charsetstr3 = purple_account_get_string(account, "encoding", OSCAR_DEFAULT_CUSTOM_ENCODING); } else { /* Unknown, hope for valid UTF-8... */