# HG changeset patch
# User Herman Bloggs <hermanator12002@yahoo.com>
# Date 1068582840 0
# Node ID 3c21f3084ff0b2fc3d720d2f2fb0955a70849809
# Parent  29d69daa1ede7d70b07d409d95a7bc88748b1fda
[gaim-migrate @ 8091]
gaim_str_strip_linefeed strips carriage returns.. changing name accordingly.

committer: Tailor Script <tailor@pidgin.im>

diff -r 29d69daa1ede -r 3c21f3084ff0 src/log.c
--- a/src/log.c	Tue Nov 11 19:51:47 2003 +0000
+++ b/src/log.c	Tue Nov 11 20:34:00 2003 +0000
@@ -73,7 +73,7 @@
 	g_return_val_if_fail(log && log->logger, NULL);
 	if (log->logger->read) {
 		char *ret = (log->logger->read)(log, flags);
-		gaim_str_strip_linefeed(ret);
+		gaim_str_strip_cr(ret);
 		return ret;
 	}
 	return (_("<b><font color=\"red\">The logger has no read function</font></b>"));
diff -r 29d69daa1ede -r 3c21f3084ff0 src/protocols/gg/gg.c
--- a/src/protocols/gg/gg.c	Tue Nov 11 19:51:47 2003 +0000
+++ b/src/protocols/gg/gg.c	Tue Nov 11 20:34:00 2003 +0000
@@ -1,6 +1,6 @@
 /*
  * gaim - Gadu-Gadu Protocol Plugin
- * $Id: gg.c 7981 2003-10-30 22:27:36Z lschiere $
+ * $Id: gg.c 8091 2003-11-11 20:34:00Z hermanator $
  *
  * Copyright (C) 2001 Arkadiusz Mi¶kiewicz <misiek@pld.ORG.PL>
  *
@@ -310,7 +310,7 @@
 			if (!allowed_uin(gc, user))
 				break;
 			imsg = charset_convert(e->event.msg.message, "CP1250", "UTF-8");
-			gaim_str_strip_linefeed(imsg);
+			gaim_str_strip_cr(imsg);
 			/* e->event.msg.time - we don't know what this time is for */
 			serv_got_im(gc, user, imsg, 0, time(NULL));
 			g_free(imsg);
diff -r 29d69daa1ede -r 3c21f3084ff0 src/protocols/oscar/oscar.c
--- 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",
diff -r 29d69daa1ede -r 3c21f3084ff0 src/protocols/yahoo/yahoo.c
--- a/src/protocols/yahoo/yahoo.c	Tue Nov 11 19:51:47 2003 +0000
+++ b/src/protocols/yahoo/yahoo.c	Tue Nov 11 20:34:00 2003 +0000
@@ -686,7 +686,7 @@
 
 				msg = pair->value;
 
-				gaim_str_strip_linefeed(msg);
+				gaim_str_strip_cr(msg);
 				m = yahoo_codes_to_html(msg);
 				serv_got_im(gc, from, m, 0, tm);
 				g_free(m);
diff -r 29d69daa1ede -r 3c21f3084ff0 src/util.c
--- a/src/util.c	Tue Nov 11 19:51:47 2003 +0000
+++ b/src/util.c	Tue Nov 11 20:34:00 2003 +0000
@@ -1516,7 +1516,7 @@
 }
 
 void
-gaim_str_strip_linefeed(char *text)
+gaim_str_strip_cr(char *text)
 {
 	int i, j;
 	char *text2;
diff -r 29d69daa1ede -r 3c21f3084ff0 src/util.h
--- a/src/util.h	Tue Nov 11 19:51:47 2003 +0000
+++ b/src/util.h	Tue Nov 11 20:34:00 2003 +0000
@@ -370,11 +370,11 @@
 char *gaim_str_add_cr(const char *str);
 
 /**
- * Strips all linefeeds from a string.
+ * Strips all carriage returns from a string.
  *
- * @param str The string to strip linefeeds from.
+ * @param str The string to strip carriage returns from.
  */
-void gaim_str_strip_linefeed(char *str);
+void gaim_str_strip_cr(char *str);
 
 /**
  * Given a string, this replaces one substring with another