Mercurial > pidgin
changeset 2916:4254491c722b
[gaim-migrate @ 2929]
whoops
committer: Tailor Script <tailor@pidgin.im>
| author | Eric Warmenhoven <eric@warmenhoven.org> |
|---|---|
| date | Sat, 22 Dec 2001 03:38:20 +0000 |
| parents | 7a158753b8d6 |
| children | 93e2c99ccf50 |
| files | src/conversation.c src/multi.h src/protocols/irc/irc.c src/protocols/oscar/oscar.c src/protocols/toc/toc.c src/protocols/yahoo/yahoo.c |
| diffstat | 6 files changed, 7 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/conversation.c Sat Dec 22 00:41:30 2001 +0000 +++ b/src/conversation.c Sat Dec 22 03:38:20 2001 +0000 @@ -1592,7 +1592,7 @@ 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_HTML) + if (c->gc->flags & OPT_CONN_SHOW_HTML) what = g_memdup(what, length == -1 ? strlen(what) + 1 : length); else what = escape_html(what, &length);
--- a/src/multi.h Sat Dec 22 00:41:30 2001 +0000 +++ b/src/multi.h Sat Dec 22 03:38:20 2001 +0000 @@ -74,6 +74,7 @@ }; #define OPT_CONN_HTML 0x00000001 +#define OPT_CONN_SHOW_HTML 0x00000002 struct proto_user_opt { char *label;
--- a/src/protocols/irc/irc.c Sat Dec 22 00:41:30 2001 +0000 +++ b/src/protocols/irc/irc.c Sat Dec 22 03:38:20 2001 +0000 @@ -1073,8 +1073,8 @@ struct irc_data *idata = gc->proto_data = g_new0(struct irc_data, 1); g_snprintf(gc->displayname, sizeof(gc->displayname), "%s", gc->username); - gc->flags = OPT_CONN_HTML; /* this is bad. the reason for this is gtkimhtml doesn't - understand the xchat escapes. so we translate. */ + gc->flags = OPT_CONN_SHOW_HTML; /* this is bad. the reason for this is gtkimhtml doesn't + understand the xchat escapes. so we translate. */ g_snprintf(buf, sizeof(buf), "Signon: %s", gc->username); set_login_progress(gc, 2, buf);
--- a/src/protocols/oscar/oscar.c Sat Dec 22 00:41:30 2001 +0000 +++ b/src/protocols/oscar/oscar.c Sat Dec 22 03:38:20 2001 +0000 @@ -460,7 +460,7 @@ gc->password[9] = 0; } else { gc->protocol = PROTO_TOC; - gc->flags |= OPT_CONN_HTML; + gc->flags |= OPT_CONN_HTML | OPT_CONN_SHOW_HTML; } sess = g_new0(aim_session_t, 1);
--- a/src/protocols/toc/toc.c Sat Dec 22 00:41:30 2001 +0000 +++ b/src/protocols/toc/toc.c Sat Dec 22 03:38:20 2001 +0000 @@ -143,7 +143,7 @@ gc = new_gaim_conn(user); gc->proto_data = tdt = g_new0(struct toc_data, 1); - gc->flags |= OPT_CONN_HTML; + gc->flags |= OPT_CONN_HTML | OPT_CONN_SHOW_HTML; g_snprintf(buf, sizeof buf, "Looking up %s", user->proto_opt[USEROPT_AUTH][0] ? user->proto_opt[USEROPT_AUTH] : TOC_HOST);
--- a/src/protocols/yahoo/yahoo.c Sat Dec 22 00:41:30 2001 +0000 +++ b/src/protocols/yahoo/yahoo.c Sat Dec 22 03:38:20 2001 +0000 @@ -707,7 +707,7 @@ struct gaim_connection *gc = new_gaim_conn(user); struct yahoo_data *yd = gc->proto_data = g_new0(struct yahoo_data, 1); - gc->flags = OPT_CONN_HTML; /* it does to an extent.... */ + gc->flags = OPT_CONN_HTML | OPT_CONN_SHOW_HTML; /* it does to an extent.... */ set_login_progress(gc, 1, "Connecting");