pidgin: 567e16cb: So apparently, I messed up the name of t...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: 567e16cbc46168f52482e5ec27626c48e7a5ba95
Ancestor: 92ce3e48744b40fb0fea89e3de5e44bedb100c07
Author: qulogic at pidgin.im
Date: 2009-08-24T01:39:31
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/567e16cbc46168f52482e5ec27626c48e7a5ba95

Modified files:
        libpurple/protocols/msn/slpcall.c

ChangeLog: 

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.

-------------- next part --------------
============================================================
--- libpurple/protocols/msn/slpcall.c	d7d2ac92bceeb95373cae7a2a8109bc2aa3e1792
+++ libpurple/protocols/msn/slpcall.c	c5cffd20e8282ade7b1d83051ffa9deb5756e5b6
@@ -205,7 +205,7 @@ msn_slp_process_msg(MsnSlpLink *slplink,
 		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 @@ msn_slp_process_msg(MsnSlpLink *slplink,
 			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)
 			{