# HG changeset patch
# User Daniel Atallah <daniel.atallah@gmail.com>
# Date 1137968580 0
# Node ID 6ea877c5a4449e3f8e96a45daeb2a600f7bd7fe7
# Parent  da97f9675fac8362a173697ef664c4c508ccac54
[gaim-migrate @ 15347]
GrayShade noticed that we weren't dealing with the line delimiters that the current yahoo client sends correctly.

committer: Tailor Script <tailor@pidgin.im>

diff -r da97f9675fac -r 6ea877c5a444 src/protocols/yahoo/yahoo.c
--- a/src/protocols/yahoo/yahoo.c	Sun Jan 22 22:08:31 2006 +0000
+++ b/src/protocols/yahoo/yahoo.c	Sun Jan 22 22:23:00 2006 +0000
@@ -750,7 +750,14 @@
 		}
 
 		m = yahoo_string_decode(gc, im->msg, im->utf8);
-		gaim_str_strip_char(m, '\r');
+		/* This may actually not be necessary, but it appears
+		 * that at least at one point some clients were sending
+		 * "\r\n" as line delimiters, so we want to avoid double
+		 * lines. */
+		m2 = gaim_strreplace(m, "\r\n", "\n");
+		g_free(m);
+		m = m2;
+		gaim_util_chrreplace(m, '\r', '\n');
 
 		if (!strcmp(m, "<ding>")) {
 			GaimConversation *c = gaim_conversation_new(GAIM_CONV_TYPE_IM,