Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv11435
Modified Files:
conversation.c multi.h
Log Message:
this was a bad hack.
Index: conversation.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/conversation.c,v
retrieving revision 1.323
retrieving revision 1.324
diff -u -d -r1.323 -r1.324
--- conversation.c 2001/12/22 03:38:19 1.323
+++ conversation.c 2001/12/22 08:08:36 1.324
@@ -1151,43 +1151,6 @@
g_free(s);
}
-static char *escape_html(char *w, int *l)
-{
- int c = 0;
- char *r;
- int i, x = 0;
- if (*l == -1) {
- *l = strlen(w);
- x = 1;
- }
- r = g_malloc(*l * 5 + 1);
-
- for (i = 0; i < *l; i++) {
- if (w[i] == '<') {
- r[c++] = '&';
- r[c++] = 'l';
- r[c++] = 't';
- r[c++] = ';';
- } else if (w[i] == '&') {
- r[c++] = '&';
- r[c++] = 'a';
- r[c++] = 'm';
- r[c++] = 'p';
- r[c++] = ';';
- } else {
- r[c++] = w[i];
- }
- }
- r[c] = 0;
-
- r = g_realloc(r, c + 1);
- if (x)
- *l = -1;
- else
- *l = c;
- return r;
-}
-
static char *html_logize(char *p)
{
@@ -1592,10 +1555,6 @@
g_snprintf(buf, BUF_LONG, "<B><FONT COLOR=\"#777777\">%s</FONT></B><BR>", what);
gtk_imhtml_append_text(GTK_IMHTML(c->text), buf, -1, 0);
} else {
- if (c->gc->flags & OPT_CONN_SHOW_HTML)
- what = g_memdup(what, length == -1 ? strlen(what) + 1 : length);
- else
- what = escape_html(what, &length);
if (flags & WFLAG_WHISPER) {
/* if we're whispering, it's not an autoresponse */
if (meify(what, length)) {
@@ -1702,8 +1661,6 @@
g_free(t2);
g_free(nm);
}
-
- g_free(what);
}
if ((c->is_chat && (chat_options & OPT_CHAT_POPUP)) ||
Index: multi.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/multi.h,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- multi.h 2001/12/22 03:38:19 1.38
+++ multi.h 2001/12/22 08:08:36 1.39
@@ -74,7 +74,6 @@
};
#define OPT_CONN_HTML 0x00000001
-#define OPT_CONN_SHOW_HTML 0x00000002
struct proto_user_opt {
char *label;
|
