diff options
| author | Sébastien Helleu <flashcode@flashtux.org> | 2017-08-19 11:24:36 +0200 |
|---|---|---|
| committer | Sébastien Helleu <flashcode@flashtux.org> | 2017-08-19 11:24:36 +0200 |
| commit | 0c86e742c588cf38a93f2f89dea5f96c48e7d0f9 (patch) | |
| tree | a6c211c8ac28397d41a69eb3ad742a50e6e438a0 | |
| parent | 835c94db4bc157516745a288530272b98558a18e (diff) | |
| download | weechat-0c86e742c588cf38a93f2f89dea5f96c48e7d0f9.zip | |
irc: do not use away color for nicks in nicklist if option irc.look.color_nicks_in_nicklist is on
| -rw-r--r-- | ChangeLog.adoc | 1 | ||||
| -rw-r--r-- | src/plugins/irc/irc-nick.c | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/ChangeLog.adoc b/ChangeLog.adoc index e31e9106f..bb6b2ec2a 100644 --- a/ChangeLog.adoc +++ b/ChangeLog.adoc @@ -38,6 +38,7 @@ Bug fixes:: * api: change type of arguments status/gnutls_rc/sock in hook_connect() callback from string to integer (in scripts) * api: change type of argument fd in hook_fd() callback from string to integer (in scripts) * buflist: fix crash in auto-scroll of bar when the buflist item is not the first item in the bar + * irc: do not use away color for nicks in nicklist if option irc.look.color_nicks_in_nicklist is on * relay: fix send of "PART" command in backlog (irc protocol) * relay: fix parsing of CAP command without arguments in irc protocol, send ACK only if all capabilities received are OK and NAK otherwise (issue #1040) diff --git a/src/plugins/irc/irc-nick.c b/src/plugins/irc/irc-nick.c index de64fd4c5..909a1e663 100644 --- a/src/plugins/irc/irc-nick.c +++ b/src/plugins/irc/irc-nick.c @@ -317,9 +317,6 @@ irc_nick_get_color_for_nicklist (struct t_irc_server *server, static char *nick_color_self = "weechat.color.chat_nick_self"; static char *nick_color_away = "weechat.color.nicklist_away"; - if (nick->away) - return nick_color_away; - if (weechat_config_boolean(irc_config_look_color_nicks_in_nicklist)) { if (irc_server_strcasecmp (server, nick->name, server->nick) == 0) @@ -328,6 +325,9 @@ irc_nick_get_color_for_nicklist (struct t_irc_server *server, return irc_nick_find_color_name (nick->name); } + if (nick->away) + return nick_color_away; + return nick_color_bar_fg; } |