# HG changeset patch # User Elliott Sales de Andrade # Date 1249013341 0 # Node ID 6c4e816873f76a199499bf211e86f65aeb0ef23a # Parent a82fec14ac0f872e8d2dcb830d08c9d16472c931 Got the 'to' and 'from' charsets backwards there, didn't I. diff -r a82fec14ac0f -r 6c4e816873f7 libpurple/protocols/msn/slp.c --- a/libpurple/protocols/msn/slp.c Fri Jul 31 04:05:57 2009 +0000 +++ b/libpurple/protocols/msn/slp.c Fri Jul 31 04:09:01 2009 +0000 @@ -341,7 +341,7 @@ bin = (char *)purple_base64_decode(context, &bin_len); file_size = GUINT32_FROM_LE(*(gsize *)(bin + 8)); - file_name = g_convert(bin + 20, -1, "UTF-16LE", "UTF-8", + file_name = g_convert(bin + 20, -1, "UTF-8", "UTF-16LE", NULL, NULL, NULL); g_free(bin); diff -r a82fec14ac0f -r 6c4e816873f7 libpurple/protocols/msn/slpcall.c --- a/libpurple/protocols/msn/slpcall.c Fri Jul 31 04:05:57 2009 +0000 +++ b/libpurple/protocols/msn/slpcall.c Fri Jul 31 04:09:01 2009 +0000 @@ -209,7 +209,7 @@ gsize bytes_read, bytes_written; body_str = g_convert((const gchar *)body, body_len / 2, - "UTF16-LE", "UTF-8", + "UTF-8", "UTF16-LE", &bytes_read, &bytes_written, &error); body_len -= bytes_read + 2; body += bytes_read + 2; @@ -230,7 +230,7 @@ g_free(body_str); body_str = g_convert((const gchar *)body, body_len / 2, - "UTF16-LE", "UTF-8", + "UTF-8", "UTF16-LE", &bytes_read, &bytes_written, &error); if (!body_str) {