# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1148925230 0
# Node ID e744943e749c2bb3170a4d334b5b3d0a58759055
# Parent  99688ab310c84ef4329a45f6f328fd8fce09cd02
[gaim-migrate @ 16202]
SF Patch #1496688 from coweater

"Gaim wasn't removing carriage returns on a yahoo
 account's away message causing a rather large buddy
 list entry.
 The stripping was being done in the code for pre-gtk
 2.6.0 but not newer versions. This patch adds that
 strip for the newer version too."

committer: Tailor Script <tailor@pidgin.im>

diff -r 99688ab310c8 -r e744943e749c src/gtkblist.c
--- a/src/gtkblist.c	Mon May 29 17:18:17 2006 +0000
+++ b/src/gtkblist.c	Mon May 29 17:53:50 2006 +0000
@@ -2938,8 +2938,10 @@
 			g_free(tmp);
 		}
 #else
-		if(tmp)
+		if(tmp) {
 			g_strdelimit(tmp, "\n", ' ');
+			gaim_str_strip_char(tmp, '\r');
+		}
 		statustext = tmp;
 #endif
 	}