Mercurial > pidgin
changeset 28081:500d1e806264
So apparently, I messed up the name of this charset. But I wonder why it
never crashed when I tested it. Also, GError's hate when you overwrite
them, so initialize error to NULL.
Fixes #10048.
author | Elliott Sales de Andrade <qulogic@pidgin.im> |
---|---|
date | Mon, 24 Aug 2009 01:39:31 +0000 |
parents | 9d620811c67c |
children | c921fe62cf59 |
files | libpurple/protocols/msn/slpcall.c |
diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/msn/slpcall.c Sun Aug 23 21:42:12 2009 +0000 +++ b/libpurple/protocols/msn/slpcall.c Mon Aug 24 01:39:31 2009 +0000 @@ -205,7 +205,7 @@ if (slpmsg->session_id == 64) { /* This is for handwritten messages (Ink) */ - GError *error; + GError *error = NULL; gsize bytes_read, bytes_written; body_str = g_convert((const gchar *)body, body_len / 2, @@ -232,7 +232,7 @@ g_free(body_str); body_str = g_convert((const gchar *)body, body_len / 2, - "UTF-8", "UTF16-LE", + "UTF-8", "UTF-16LE", &bytes_read, &bytes_written, &error); if (!body_str) {