Mercurial > pidgin3 / file diff

--- a/src/protocols/oscar/oscar.c	Tue Nov 11 19:51:47 2003 +0000
+++ b/src/protocols/oscar/oscar.c	Tue Nov 11 20:34:00 2003 +0000
@@ -2265,7 +2265,7 @@
 		}
 	}
 
-	/* gaim_str_strip_linefeed(tmp); */
+	/* gaim_str_strip_cr(tmp); */
 	serv_got_im(gc, userinfo->sn, tmp, flags, time(NULL));
 	g_free(tmp);
 
@@ -2565,7 +2565,7 @@
 	for (numtoks=0; msg1[numtoks]; numtoks++);
 	msg2 = (gchar **)g_malloc((numtoks+1)*sizeof(gchar *));
 	for (i=0; msg1[i]; i++) {
-		gaim_str_strip_linefeed(msg1[i]);
+		gaim_str_strip_cr(msg1[i]);
 		msg2[i] = g_convert(msg1[i], strlen(msg1[i]), "UTF-8", "ISO-8859-1", NULL, NULL, &err);
 		if (err) {
 			gaim_debug(GAIM_DEBUG_ERROR, "oscar",