diff options
| author | Paul Aurich <darkrain42@pidgin.im> | 2009-12-04 06:24:30 +0000 |
|---|---|---|
| committer | Paul Aurich <darkrain42@pidgin.im> | 2009-12-04 06:24:30 +0000 |
| commit | 433ada407a4725e470f69b6e652919f6c9fa2451 (patch) | |
| tree | c4b933f076002d152696a54fc85118a886377c1b | |
| parent | 9f9ed6b44278e0c29dceb5848db8de50f751bcd5 (diff) | |
| parent | 655a16bae27b4c01d006045f5548c3363c1d2a99 (diff) | |
| download | pidgin-433ada407a4725e470f69b6e652919f6c9fa2451.tar.gz | |
propagate from branch 'im.pidgin.pidgin' (head a231746555d7860bccb22c1794c28dcf395b3026)
to branch 'im.pidgin.cpw.darkrain42.xmpp.scram' (head b351fcdeede7489a222ef27e08fff5f688763477)
| -rw-r--r-- | libpurple/protocols/oscar/oscar.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libpurple/protocols/oscar/oscar.c b/libpurple/protocols/oscar/oscar.c index fb0a54e4e9..2feb345252 100644 --- a/libpurple/protocols/oscar/oscar.c +++ b/libpurple/protocols/oscar/oscar.c @@ -457,10 +457,10 @@ purple_plugin_oscar_decode_im_part(PurpleAccount *account, const char *sourcebn, 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... */ |