Mercurial > pidgin
changeset 28624:730ed9c1c780
merge of '569642987f6f11fdb718731b245d60f535fe0962'
and 'c3164aa8a77e2e8f860904f1e7384e8c9f609890'
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Sun, 22 Nov 2009 23:35:26 +0000 |
| parents | 04b0ba94d646 (current diff) 2e78aca08742 (diff) |
| children | 363691903201 |
| files | |
| diffstat | 1 files changed, 1 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/oscar/oscar.c Sun Nov 22 23:34:52 2009 +0000 +++ b/libpurple/protocols/oscar/oscar.c Sun Nov 22 23:35:26 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;