Mercurial > pidgin.yaz
changeset 28095:6c4e816873f7
Got the 'to' and 'from' charsets backwards there, didn't I.
| author | Elliott Sales de Andrade <qulogic@pidgin.im> |
|---|---|
| date | Fri, 31 Jul 2009 04:09:01 +0000 |
| parents | a82fec14ac0f |
| children | 1a6c2144ba08 |
| files | libpurple/protocols/msn/slp.c libpurple/protocols/msn/slpcall.c |
| diffstat | 2 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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);
--- 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) {