# HG changeset patch
# User Elliott Sales de Andrade <qulogic@pidgin.im>
# Date 1247803860 0
# Node ID 0f48945aa77f2fc55bda2712c18826b21ba34d5f
# Parent  ccb1f1777df756e61707883f0f1631ea27d55c1e
Only fall back to ISO-8859-1 for text/plain messages. This fixes some wrong
double-encoding of custom smiley names.

Fixes #8113.

diff -r ccb1f1777df7 -r 0f48945aa77f libpurple/protocols/msn/msg.c
--- a/libpurple/protocols/msn/msg.c	Thu Jul 16 05:17:45 2009 +0000
+++ b/libpurple/protocols/msn/msg.c	Fri Jul 17 04:11:00 2009 +0000
@@ -349,7 +349,8 @@
 			msg->body[msg->body_len] = '\0';
 		}
 		
-		if (msg->charset == NULL) {
+		if ((!content_type || !strcmp(content_type, "text/plain"))
+			&& msg->charset == NULL) {
 			char *body = g_convert(msg->body, msg->body_len, "UTF-8",
 			                       "ISO-8859-1", NULL, &msg->body_len, NULL);
 			g_free(msg->body);