Sun, 22 Nov 2009 23:35:26 +0000
merge of 'dd3ffb65a2d9962f711fa6a9ca6760661ef8db2c'
and '6652b1de8f262b32e9ad64aef11cf8e4fa548f93'
--- 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;