pidgin: a6c4b3ed: Got the 'to' and 'from' charsets backwar...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: a6c4b3ed3fdfcd5eafd45342656fed541020f353
Ancestor: 4ab44f6d2d3f9667a26d8150bb6db0c7f9babf6a
Author: qulogic at pidgin.im
Date: 2009-07-31T04:09:01
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/a6c4b3ed3fdfcd5eafd45342656fed541020f353

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

ChangeLog: 

Got the 'to' and 'from' charsets backwards there, didn't I.

-------------- next part --------------
============================================================
--- libpurple/protocols/msn/slp.c	4fe55d77444e8870f08c608df124a0220070fc3c
+++ libpurple/protocols/msn/slp.c	92ca8c0c8d33b56e326f79b30cc3a875d2b3d4b8
@@ -341,7 +341,7 @@ got_sessionreq(MsnSlpCall *slpcall, cons
 			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);
============================================================
--- libpurple/protocols/msn/slpcall.c	d99dc9d24dc7db3c928f73280aba7047f0e5bded
+++ libpurple/protocols/msn/slpcall.c	c485ab48b7d47d1ea170e2ccc24aeb521a6e2045
@@ -209,7 +209,7 @@ msn_slp_process_msg(MsnSlpLink *slplink,
 			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 @@ msn_slp_process_msg(MsnSlpLink *slplink,
 			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)
 			{