[Gaim-commits] CVS: gaim/src buddy_chat.c,1.114,1.115 gaim.h,1.263,1.264 util.c,1.102,1.103

[Eric W. <war...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv31341/src

Modified Files:
	buddy_chat.c gaim.h util.c 
Log Message:
continuing the big code reorganization


Index: buddy_chat.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/buddy_chat.c,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -d -r1.114 -r1.115
--- buddy_chat.c	2001/09/27 06:04:59	1.114
+++ buddy_chat.c	2001/09/27 17:44:23	1.115
@@ -530,7 +530,6 @@
 
 	gtk_editable_delete_text(GTK_EDITABLE(b->entry), 0, -1);
 
-	escape_text(buf);	/* it's ok to leave this here because oscar can't whisper */
 	serv_chat_whisper(b->gc, b->id, who, buf);
 
 	g_snprintf(buf2, sizeof(buf2), "%s->%s", b->gc->username, who);

Index: gaim.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gaim.h,v
retrieving revision 1.263
retrieving revision 1.264
diff -u -d -r1.263 -r1.264
--- gaim.h	2001/09/27 09:20:47	1.263
+++ gaim.h	2001/09/27 17:44:23	1.264
@@ -616,9 +616,7 @@
 
 /* Functions in util.c */
 extern char *normalize(const char *);
-extern int escape_text(char *);
 extern char *escape_text2(const char *);
-extern int escape_message(char *msg);
 extern char *tobase64(const char *);
 extern void frombase64(const char *, char **, int *);
 extern gint clean_pid(gpointer);

Index: util.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/util.c,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -d -r1.102 -r1.103
--- util.c	2001/09/27 09:20:47	1.102
+++ util.c	2001/09/27 17:44:23	1.103
@@ -477,76 +477,6 @@
 		return open_gaim_log_file("system", &x);
 }
 
-/* we only need this for TOC, because messages must be escaped */
-int escape_message(char *msg)
-{
-	char *c, *cpy;
-	int cnt = 0;
-	/* Assumes you have a buffer able to cary at least BUF_LEN * 2 bytes */
-	if (strlen(msg) > BUF_LEN) {
-		debug_printf("Warning:  truncating message to 2048 bytes\n");
-		msg[2047] = '\0';
-	}
-
-	cpy = g_strdup(msg);
-	c = cpy;
-	while (*c) {
-		switch (*c) {
-		case '$':
-		case '[':
-		case ']':
-		case '(':
-		case ')':
-		case '#':
-			msg[cnt++] = '\\';
-			/* Fall through */
-		default:
-			msg[cnt++] = *c;
-		}
-		c++;
-	}
-	msg[cnt] = '\0';
-	g_free(cpy);
-	return cnt;
-}
-
-/* we don't need this for oscar either */
-int escape_text(char *msg)
-{
-	char *c, *cpy;
-	int cnt = 0;
-	/* Assumes you have a buffer able to cary at least BUF_LEN * 4 bytes */
-	if (strlen(msg) > BUF_LEN) {
-		fprintf(stderr, "Warning:  truncating message to 2048 bytes\n");
-		msg[2047] = '\0';
-	}
-
-	cpy = g_strdup(msg);
-	c = cpy;
-	while (*c) {
-		switch (*c) {
-		case '\n':
-			msg[cnt++] = '<';
-			msg[cnt++] = 'B';
-			msg[cnt++] = 'R';
-			msg[cnt++] = '>';
-			break;
-		case '{':
-		case '}':
-		case '\\':
-		case '"':
-			msg[cnt++] = '\\';
-			/* Fall through */
-		default:
-			msg[cnt++] = *c;
-		}
-		c++;
-	}
-	msg[cnt] = '\0';
-	g_free(cpy);
-	return cnt;
-}
-
 char *escape_text2(const char *msg)
 {
 	char *c, *cpy;