# HG changeset patch
# User Eric Warmenhoven <eric@warmenhoven.org>
# Date 1007075829 0
# Node ID 8ceb67d1645e87a9540a9919c44b16999bec7592
# Parent  08048a6922da8dae433ca2f393ff7a23619915ee
[gaim-migrate @ 2830]
linefeed

committer: Tailor Script <tailor@pidgin.im>

diff -r 08048a6922da -r 8ceb67d1645e src/protocols/oscar/oscar.c
--- a/src/protocols/oscar/oscar.c	Thu Nov 29 20:55:39 2001 +0000
+++ b/src/protocols/oscar/oscar.c	Thu Nov 29 23:17:09 2001 +0000
@@ -1339,6 +1339,7 @@
 	} else
 		g_snprintf(tmp, BUF_LONG, "%s", args->msg);
 
+	strip_linefeed(tmp);
 	serv_got_im(gc, userinfo->sn, tmp, flags, time(NULL));
 	g_free(tmp);
 
@@ -2063,9 +2064,12 @@
 
 	if (msg->type == 0x0001) {
 		char sender[32];
+		char *tmp = g_strdup(msg->msg);
 		time_t t = get_time(msg->year, msg->month, msg->day, msg->hour, msg->minute, 0);
 		g_snprintf(sender, sizeof(sender), "%lu", msg->sender);
-		serv_got_im(gc, sender, msg->msg, 0, t);
+		strip_linefeed(tmp);
+		serv_got_im(gc, sender, tmp, 0, t);
+		g_free(tmp);
 	} else {
 		debug_printf("unknown offline message type 0x%04x\n", msg->type);
 	}