pidgin: 1cd91846: Improved handling of the 0x00d charset i...

[evands at pidgin.im]

-----------------------------------------------------------------
Revision: 1cd91846f484f7d7090d25b0e65d851a0dadcb90
Ancestor: 2b7a2f20d950d118157c7629dfbfa17b7afb04f0
Author: evands at pidgin.im
Date: 2009-12-04T02:24:41
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/1cd91846f484f7d7090d25b0e65d851a0dadcb90

Modified files:
        libpurple/protocols/oscar/oscar.c

ChangeLog: 

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

-------------- next part --------------
============================================================
--- libpurple/protocols/oscar/oscar.c	527d8aac476b586cb1f72b77660795462d0cd01c
+++ libpurple/protocols/oscar/oscar.c	945f8394b2dddf8973f4ff2f482137c23d5881ce
@@ -457,10 +457,10 @@ purple_plugin_oscar_decode_im_part(Purpl
 		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... */