diff options
| author | Wouter Coekaerts <coekie@irssi.org> | 2004-10-06 16:25:34 +0000 |
|---|---|---|
| committer | coekie <coekie@dbcabf3a-b0e7-0310-adc4-f8d773084564> | 2004-10-06 16:25:34 +0000 |
| commit | fa80d4913b4a103a6bfc184245d880eda9ef20d4 (patch) | |
| tree | b74dde7e31778f31fb2daa00461347ec6e9c5b7f /src/fe-common/core/hilight-text.c | |
| parent | c5982338c131d096914e48aceb6b786c31a7686f (diff) | |
| download | irssi-fa80d4913b4a103a6bfc184245d880eda9ef20d4.zip | |
Fix HILIGHT -actcolor -mask (Bug 131)
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@3309 dbcabf3a-b0e7-0310-adc4-f8d773084564
Diffstat (limited to 'src/fe-common/core/hilight-text.c')
| -rw-r--r-- | src/fe-common/core/hilight-text.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/fe-common/core/hilight-text.c b/src/fe-common/core/hilight-text.c index 796a482b..b379b814 100644 --- a/src/fe-common/core/hilight-text.c +++ b/src/fe-common/core/hilight-text.c @@ -279,7 +279,7 @@ static char *hilight_get_act_color(HILIGHT_REC *rec) settings_get_str("hilight_act_color")); } -static char *hilight_get_color(HILIGHT_REC *rec) +char *hilight_get_color(HILIGHT_REC *rec) { const char *color; @@ -291,7 +291,7 @@ static char *hilight_get_color(HILIGHT_REC *rec) return format_string_expand(color, NULL); } -static void hilight_update_text_dest(TEXT_DEST_REC *dest, HILIGHT_REC *rec) +void hilight_update_text_dest(TEXT_DEST_REC *dest, HILIGHT_REC *rec) { dest->level |= MSGLEVEL_HILIGHT; @@ -305,6 +305,8 @@ static void hilight_update_text_dest(TEXT_DEST_REC *dest, HILIGHT_REC *rec) dest->hilight_color = hilight_get_act_color(rec); } +static void hilight_print(int index, HILIGHT_REC *rec); + static void sig_print_text(TEXT_DEST_REC *dest, const char *text, const char *stripped) { @@ -398,19 +400,15 @@ static void sig_print_text(TEXT_DEST_REC *dest, const char *text, signal_stop(); } -char *hilight_match_nick(SERVER_REC *server, const char *channel, +HILIGHT_REC *hilight_match_nick(SERVER_REC *server, const char *channel, const char *nick, const char *address, int level, const char *msg) { HILIGHT_REC *rec; - char *color; rec = hilight_match(server, channel, nick, address, level, msg, NULL, NULL); - color = rec == NULL || !rec->nick ? NULL : - hilight_get_color(rec); - - return color; + return (rec == NULL || !rec->nick) ? NULL : rec; } static void read_hilight_config(void) |