Mercurial > pidgin
changeset 28755:fb550b27c6d8
propagate from branch 'im.pidgin.pidgin' (head 1cd91846f484f7d7090d25b0e65d851a0dadcb90)
to branch 'im.pidgin.cpw.darkrain42.xmpp.scram' (head 7b57cce9601efeea3f4d2686c7961fa156703393)
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Fri, 04 Dec 2009 06:24:30 +0000 |
| parents | f8da53e381dd (diff) b94fd073187c (current diff) |
| children | 25faae72d314 |
| files | |
| diffstat | 1 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/oscar/oscar.c Fri Dec 04 06:18:05 2009 +0000 +++ b/libpurple/protocols/oscar/oscar.c Fri Dec 04 06:24:30 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... */