pidgin: b1b8c222: Add newlines to debug messages, and word...

[qulogic at pidgin.im]

----------------------------------------------------------------------
Revision: b1b8c222ab921963f43e83502b6c6e2e4489a8c4
Parent:   ecabfaee8a1ca02e18ebadbb41cdcce19e78bc2e
Author:   qulogic at pidgin.im
Date:     01/28/12 01:05:48
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/b1b8c222ab921963f43e83502b6c6e2e4489a8c4

Changelog: 

Add newlines to debug messages, and word-wrap lines.

Changes against parent ecabfaee8a1ca02e18ebadbb41cdcce19e78bc2e

  patched  libpurple/protocols/msn/oim.c

-------------- next part --------------
============================================================
--- libpurple/protocols/msn/oim.c	c8e2c02ec8580bd446caca688bc80b90a52cb0f6
+++ libpurple/protocols/msn/oim.c	23a616c617ec7f7ac83515d1d179f49c659e8703
@@ -660,16 +660,17 @@ msn_oim_report_to_user(MsnOimRecvData *r
 		charset = msn_message_get_charset(message);
 	}
 
-
 	if (charset && !((strncasecmp(charset, "UTF-8", 5) == 0) || (strncasecmp(charset, "UTF8", 4) == 0))) {
 		clean_msg = g_convert(decode_msg, strlen(decode_msg), "UTF-8", charset, NULL, NULL, NULL);
 
 		if (!clean_msg) {
 			char *clean = purple_utf8_salvage(decode_msg);
 
-			purple_debug_error("msn", "Failed to convert charset from %s to UTF-8 for OIM message: %s", charset, clean);
+			purple_debug_error("msn", "Failed to convert charset from %s to UTF-8 for OIM message: %s\n", charset, clean);
 
-			clean_msg = g_strdup_printf(_("%s (There was an error receiving this message. Converting the encoding from %s to UTF-8 failed.)"), clean, charset);
+			clean_msg = g_strdup_printf(_("%s (There was an error receiving this message. "
+			                              "Converting the encoding from %s to UTF-8 failed.)"),
+			                            clean, charset);
 			g_free(clean);
 		}
 
@@ -679,12 +680,17 @@ msn_oim_report_to_user(MsnOimRecvData *r
 		if (!g_utf8_validate(decode_msg, -1, NULL)) {
 			char *clean = purple_utf8_salvage(decode_msg);
 
-			purple_debug_error("msn", "Received an OIM message that is not UTF-8, and no encoding specified: %s", clean);
+			purple_debug_error("msn", "Received an OIM message that is not UTF-8,"
+			                          " and no encoding specified: %s\n", clean);
 
 			if (charset) {
-				clean_msg = g_strdup_printf(_("%s (There was an error receiving this message. The charset was %s, but it was not valid UTF-8.)"), clean, charset);
+				clean_msg = g_strdup_printf(_("%s (There was an error receiving this message."
+				                              " The charset was %s, but it was not valid UTF-8.)"),
+				                            clean, charset);
 			} else {
-				clean_msg = g_strdup_printf(_("%s (There was an error receiving this message. The charset was missing, but it was not valid UTF-8.)"), clean);
+				clean_msg = g_strdup_printf(_("%s (There was an error receiving this message."
+				                              " The charset was missing, but it was not valid UTF-8.)"),
+				                            clean);
 			}
 
 			g_free(clean);