summaryrefslogtreecommitdiff
path: root/src/plugins
diff options
context:
space:
mode:
authorSebastien Helleu <flashcode@flashtux.org>2011-04-11 15:52:31 +0200
committerSebastien Helleu <flashcode@flashtux.org>2011-04-11 15:52:31 +0200
commit85c5653713cd54600be73f1e7a06cc0f3862e7ed (patch)
treed7096c98f2aa45e7b8056b66d6e127bf8a11819a /src/plugins
parent5ee0d7a4564078ddb9541f2ff6c903c10c61bc00 (diff)
downloadweechat-85c5653713cd54600be73f1e7a06cc0f3862e7ed.zip
irc: use nick color for users outside the channel
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/irc/irc-ctcp.c2
-rw-r--r--src/plugins/irc/irc-nick.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/irc/irc-ctcp.c b/src/plugins/irc/irc-ctcp.c
index b524bd328..97deb31e7 100644
--- a/src/plugins/irc/irc-ctcp.c
+++ b/src/plugins/irc/irc-ctcp.c
@@ -899,7 +899,7 @@ irc_ctcp_recv (struct t_irc_server *server, const char *command,
nick),
"%s%s%s%s%s%s",
weechat_prefix ("action"),
- (ptr_nick) ? ptr_nick->color : IRC_COLOR_CHAT_NICK,
+ (ptr_nick) ? ptr_nick->color : ((nick) ? irc_nick_find_color (nick) : IRC_COLOR_CHAT_NICK),
nick,
(pos_args) ? IRC_COLOR_CHAT : "",
(pos_args) ? " " : "",
diff --git a/src/plugins/irc/irc-nick.c b/src/plugins/irc/irc-nick.c
index d97426648..322cb10d0 100644
--- a/src/plugins/irc/irc-nick.c
+++ b/src/plugins/irc/irc-nick.c
@@ -897,7 +897,7 @@ irc_nick_as_prefix (struct t_irc_server *server, struct t_irc_nick *nick,
weechat_config_string (irc_config_look_nick_prefix) : "",
str_prefix_color,
prefix,
- (force_color) ? force_color : ((nick) ? nick->color : IRC_COLOR_CHAT_NICK),
+ (force_color) ? force_color : ((nick) ? nick->color : ((nickname) ? irc_nick_find_color (nickname) : IRC_COLOR_CHAT_NICK)),
(nick) ? nick->name : nickname,
(weechat_config_string (irc_config_look_nick_suffix)
&& weechat_config_string (irc_config_look_nick_suffix)[0]) ?