changeset 12994:6ea877c5a444

[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>
author Daniel Atallah <daniel.atallah@gmail.com>
date Sun, 22 Jan 2006 22:23:00 +0000
parents da97f9675fac
children 595f690399e4
files src/protocols/yahoo/yahoo.c
diffstat 1 files changed, 8 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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,