Mercurial > pidgin.yaz
changeset 27803:8dfe3a985fc1
replaced deprecated UCS-2BE with UTF-16BE
| author | Yoshiki Yazawa <yaz@honeyplanet.jp> |
|---|---|
| date | Wed, 19 Mar 2008 19:16:07 +0000 |
| parents | 4d8e1c17b3f9 |
| children | d44a96d49ee5 |
| files | libpurple/protocols/oscar/family_icbm.c libpurple/protocols/oscar/oscar.c |
| diffstat | 2 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/oscar/family_icbm.c Mon Mar 17 07:20:59 2008 +0000 +++ b/libpurple/protocols/oscar/family_icbm.c Wed Mar 19 19:16:07 2008 +0000 @@ -536,7 +536,7 @@ aim_tlvlist_add_raw(&inner_tlvlist, 0x000d, 11, (guint8 *)"unicode-2-0"); aim_tlvlist_add_noval(&inner_tlvlist, 0x000f); //yaz - ucs = g_convert(msg, strlen(msg), "UCS-2BE", "UTF-8", NULL, &bytes, NULL); + ucs = g_convert(msg, strlen(msg), "UTF-16BE", "UTF-8", NULL, &bytes, NULL); if(ucs){ botch_ucs(ucs, bytes); aim_tlvlist_add_raw(&inner_tlvlist, 0x000c, bytes, (guint8 *)ucs);
--- a/libpurple/protocols/oscar/oscar.c Mon Mar 17 07:20:59 2008 +0000 +++ b/libpurple/protocols/oscar/oscar.c Wed Mar 19 19:16:07 2008 +0000 @@ -311,9 +311,9 @@ goto done; } // not UTF-8 - purple_debug_info("yaz oscar", "Empty encoding, assuming UCS-2BE\n"); + purple_debug_info("yaz oscar", "Empty encoding, assuming UTF-16BE\n"); sanitize_ucs((gchar *)text, textlen); - utf8 = g_convert(text, textlen, "UTF-8", "UCS-2BE", NULL, NULL, NULL); + utf8 = g_convert(text, textlen, "UTF-8", "UTF-16BE", NULL, NULL, NULL); if(utf8){ if(!g_utf8_validate(utf8, strlen(utf8), NULL)){ purple_debug_info("yaz oscar", "Invalid conversion\n");