Mercurial > pidgin.yaz
changeset 29002:2e78aca08742
merge of '94344158f35dde02dc906e3e5e39e58a326ff1be'
and 'e678005b4a80403eab51365dced9586b52416176'
| author | Elliott Sales de Andrade <qulogic@pidgin.im> |
|---|---|
| date | Sun, 22 Nov 2009 23:11:19 +0000 |
| parents | 2ab56f7e801e (current diff) ca0f113fee11 (diff) |
| children | a401d3500a75 730ed9c1c780 |
| files | |
| diffstat | 1 files changed, 1 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/oscar/oscar.c Sun Nov 22 23:00:57 2009 +0000 +++ b/libpurple/protocols/oscar/oscar.c Sun Nov 22 23:11:19 2009 +0000 @@ -577,7 +577,7 @@ return; } - purple_debug_info("oscar", "Conversion from UTF-8 to %s failed (%s), falling back to unicode.\n", + purple_debug_info("oscar", "Conversion from UTF-8 to %s failed (%s). Falling back to unicode.\n", charsetstr, err->message); g_error_free(err); err = NULL; @@ -587,9 +587,6 @@ */ *msg = g_convert(from, -1, "UTF-16BE", "UTF-8", NULL, &msglen, &err); if (*msg != NULL) { - purple_debug_info("oscar", "Conversion from UTF-8 to UTF-16BE results in %s.\n", - *msg); - *charset = AIM_CHARSET_UNICODE; *charsubset = 0x0000; *msglen_int = msglen;