changeset
merge of 'a6968ba94d1da72f329cb985ab71ba6883f9c7dd'
Sun, 22 Nov 2009 23:11:19 +0000
- author
- Elliott Sales de Andrade <qulogic@pidgin.im>
- date
- Sun, 22 Nov 2009 23:11:19 +0000
- changeset 28955
- 6652b1de8f26
- parent 28951
- a6968ba94d1d (current diff)
- parent 28954
- 7871e719dfa5 (diff)
- child 28956
- 4eabbfd13a2b
- child 28959
- b4ba3568c528
merge of 'a6968ba94d1da72f329cb985ab71ba6883f9c7dd'
and '7871e719dfa5aa6cfb04ca60153023ed6879c1fc'
--- 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;
