Mercurial > pidgin.yaz
changeset 28587:98c5109a3d1f
Rename AIM_CHARSET_CUSTOM to AIM_CHARSET_LATIN_1 as described at
http://dev.aol.com/aim/oscar/#ICBM__IM_SECTION_ENCODINGS
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Sun, 06 Sep 2009 21:07:56 +0000 |
| parents | 26ce61fc9556 |
| children | 8d5380556f12 |
| files | libpurple/protocols/oscar/family_icbm.c libpurple/protocols/oscar/oscar.c libpurple/protocols/oscar/oscar.h |
| diffstat | 3 files changed, 11 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/oscar/family_icbm.c Sun Sep 06 20:59:54 2009 +0000 +++ b/libpurple/protocols/oscar/family_icbm.c Sun Sep 06 21:07:56 2009 +0000 @@ -1466,7 +1466,7 @@ /* Should this be ASCII -> UNICODE -> Custom */ static const guint16 charsetpri[] = { AIM_CHARSET_ASCII, /* ASCII first */ - AIM_CHARSET_CUSTOM, /* then ISO-8859-1 */ + AIM_CHARSET_LATIN_1, /* then ISO-8859-1 */ AIM_CHARSET_UNICODE, /* UNICODE as last resort */ }; static const int charsetpricount = 3;
--- a/libpurple/protocols/oscar/oscar.c Sun Sep 06 20:59:54 2009 +0000 +++ b/libpurple/protocols/oscar/oscar.c Sun Sep 06 21:07:56 2009 +0000 @@ -241,7 +241,7 @@ { if ((unsigned char)utf8[i] > 0x7f) { /* not ASCII! */ - charset = AIM_CHARSET_CUSTOM; + charset = AIM_CHARSET_LATIN_1; break; } i++; @@ -428,7 +428,7 @@ if (charset == AIM_CHARSET_UNICODE) { charsetstr1 = "UTF-16BE"; charsetstr2 = "UTF-8"; - } else if (charset == AIM_CHARSET_CUSTOM) { + } else if (charset == AIM_CHARSET_LATIN_1) { if ((sourcebn != NULL) && oscar_util_valid_name_icq(sourcebn)) charsetstr1 = purple_account_get_string(account, "encoding", OSCAR_DEFAULT_CUSTOM_ENCODING); else @@ -539,7 +539,7 @@ */ *msg = g_convert(from, -1, charsetstr, "UTF-8", NULL, &msglen, &err); if (*msg != NULL) { - *charset = AIM_CHARSET_CUSTOM; + *charset = AIM_CHARSET_LATIN_1; *charsubset = 0x0000; *msglen_int = msglen; return; @@ -2801,7 +2801,7 @@ gchar *reason = NULL; if (msg2[5] != NULL) - reason = purple_plugin_oscar_decode_im_part(account, bn, AIM_CHARSET_CUSTOM, 0x0000, msg2[5], strlen(msg2[5])); + reason = purple_plugin_oscar_decode_im_part(account, bn, AIM_CHARSET_LATIN_1, 0x0000, msg2[5], strlen(msg2[5])); purple_debug_info("oscar", "Received an authorization request from UIN %u\n", @@ -4687,7 +4687,7 @@ if (charset == AIM_CHARSET_UNICODE) { encoded = g_convert(str, -1, "UTF-16BE", "UTF-8", NULL, ret_len, NULL); *encoding = "unicode-2-0"; - } else if (charset == AIM_CHARSET_CUSTOM) { + } else if (charset == AIM_CHARSET_LATIN_1) { encoded = g_convert(str, -1, "ISO-8859-1", "UTF-8", NULL, ret_len, NULL); *encoding = "iso-8859-1"; } else { @@ -5590,7 +5590,7 @@ buddy = purple_find_buddy(account, bn); if (msg != NULL) - reason = purple_plugin_oscar_decode_im_part(account, bn, AIM_CHARSET_CUSTOM, 0x0000, msg, strlen(msg)); + reason = purple_plugin_oscar_decode_im_part(account, bn, AIM_CHARSET_LATIN_1, 0x0000, msg, strlen(msg)); data = g_new(struct name_data, 1); data->gc = gc; @@ -5827,7 +5827,7 @@ charsetstr = "us-ascii"; else if (charset == AIM_CHARSET_UNICODE) charsetstr = "unicode-2-0"; - else if (charset == AIM_CHARSET_CUSTOM) + else if (charset == AIM_CHARSET_LATIN_1) charsetstr = "iso-8859-1"; aim_chat_send_im(od, c->conn, 0, buf2, len, charsetstr, "en"); g_free(buf2);
--- a/libpurple/protocols/oscar/oscar.h Sun Sep 06 20:59:54 2009 +0000 +++ b/libpurple/protocols/oscar/oscar.h Sun Sep 06 21:07:56 2009 +0000 @@ -808,9 +808,9 @@ #define AIM_IMFLAGS_OFFLINE 0x0800 /* send to offline user */ #define AIM_IMFLAGS_TYPINGNOT 0x1000 /* typing notification */ -#define AIM_CHARSET_ASCII 0x0000 -#define AIM_CHARSET_UNICODE 0x0002 /* UTF-16BE */ -#define AIM_CHARSET_CUSTOM 0x0003 +#define AIM_CHARSET_ASCII 0x0000 /* ISO 646 */ +#define AIM_CHARSET_UNICODE 0x0002 /* ISO 10646 (UTF-16/UCS-2BE) */ +#define AIM_CHARSET_LATIN_1 0x0003 /* ISO 8859-1 */ /* * Multipart message structures.