diff options
| author | Berke Viktor <bviktor@hexchat.org> | 2012-09-01 21:38:00 +0200 |
|---|---|---|
| committer | Berke Viktor <bviktor@hexchat.org> | 2012-09-01 21:38:00 +0200 |
| commit | 4f887a1e536044cca9b4a865917ca56288032b07 (patch) | |
| tree | 10c841790aa7bd5532743facd59afb203b9204aa /src/common/text.c | |
| parent | fb00928c9df3a8152113674f4b85ba0fdf1679c8 (diff) | |
Consolidate color stripping for messages, topic and scrollback
Diffstat (limited to 'src/common/text.c')
| -rw-r--r-- | src/common/text.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/common/text.c b/src/common/text.c index 7ec5d0ae..220fca1b 100644 --- a/src/common/text.c +++ b/src/common/text.c @@ -340,12 +340,12 @@ scrollback_load (session *sess) text = strchr (buf + 3, ' '); if (text) { - if (prefs.text_replay_strip_color) + if (prefs.text_stripcolor_replay) { text = strip_color (text + 1, -1, STRIP_COLOR); } fe_print_text (sess, text, stamp); - if (prefs.text_replay_strip_color) + if (prefs.text_stripcolor_replay) { g_free (text); } @@ -381,21 +381,21 @@ scrollback_load (session *sess) text = strchr (buf + 3, ' '); if (text) { - if (prefs.text_replay_strip_color) + if (prefs.text_stripcolor_replay) { text = strip_color (text + 1, -1, STRIP_COLOR); } cleaned_text = text_replace_non_bmp (text, -1, &cleaned_len); if (cleaned_text != NULL) { - if (prefs.text_replay_strip_color) + if (prefs.text_stripcolor_replay) { g_free (text); } text = cleaned_text; } fe_print_text (sess, text, stamp); - if (prefs.text_replay_strip_color) + if (prefs.text_stripcolor_replay) { g_free (text); } @@ -1799,7 +1799,7 @@ load_text_events () /* CL: format_event now handles filtering of arguments: - 1) if prefs.stripcolor is set, filter all style control codes from arguments + 1) if prefs.text_stripcolor_msg is set, filter all style control codes from arguments 2) always strip \010 (ATTR_HIDDEN) from arguments: it is only for use in the format string itself */ #define ARG_FLAG(argn) (1 << (argn)) @@ -2095,7 +2095,7 @@ text_emit (int index, session *sess, char *a, char *b, char *c, char *d) { char *word[PDIWORDS]; int i; - unsigned int stripcolor_args = (prefs.stripcolor ? 0xFFFFFFFF : 0); + unsigned int stripcolor_args = (prefs.text_stripcolor_msg ? 0xFFFFFFFF : 0); char tbuf[NICKLEN + 4]; if (prefs.colorednicks && (index == XP_TE_CHANACTION || index == XP_TE_CHANMSG)) |