# HG changeset patch
# User Elliott Sales de Andrade <qulogic@pidgin.im>
# Date 1258931479 0
# Node ID 2e78aca0874213c073f1352ff8e5689b02de384f
# Parent  2ab56f7e801e482f096e89d971982d0fd2f9e67d# Parent  ca0f113fee11922b08b37ca23b42caa73efd8bc4
merge of '94344158f35dde02dc906e3e5e39e58a326ff1be'
     and 'e678005b4a80403eab51365dced9586b52416176'

diff -r 2ab56f7e801e -r 2e78aca08742 libpurple/protocols/oscar/oscar.c
--- a/libpurple/protocols/oscar/oscar.c	Sun Nov 22 23:00:57 2009 +0000
+++ b/libpurple/protocols/oscar/oscar.c	Sun Nov 22 23:11:19 2009 +0000
@@ -577,7 +577,7 @@
 		return;
 	}
 
-	purple_debug_info("oscar", "Conversion from UTF-8 to %s failed (%s), falling back to unicode.\n",
+	purple_debug_info("oscar", "Conversion from UTF-8 to %s failed (%s). Falling back to unicode.\n",
 					  charsetstr, err->message);
 	g_error_free(err);
 	err = NULL;
@@ -587,9 +587,6 @@
 	 */
 	*msg = g_convert(from, -1, "UTF-16BE", "UTF-8", NULL, &msglen, &err);
 	if (*msg != NULL) {
-		purple_debug_info("oscar", "Conversion from UTF-8 to UTF-16BE results in %s.\n",
-						  *msg);
-
 		*charset = AIM_CHARSET_UNICODE;
 		*charsubset = 0x0000;
 		*msglen_int = msglen;