1
0
mirror of https://github.com/weechat/weechat.git synced 2026-07-07 02:03:13 +02:00

irc: add argument "server_message" in function irc_nick_color_for_msg

This commit is contained in:
Sébastien Helleu
2014-11-01 11:40:21 +01:00
parent 0d1bfb4dc5
commit b1caceb6e5
7 changed files with 264 additions and 231 deletions
+10 -16
View File
@@ -507,8 +507,7 @@ irc_notify_display (struct t_irc_server *server, struct t_gui_buffer *buffer,
{
weechat_printf (buffer,
" %s%s%s @ %s%s%s: %s%s",
irc_nick_color_for_server_message (server, NULL,
notify->nick),
irc_nick_color_for_msg (server, 1, NULL, notify->nick),
notify->nick,
IRC_COLOR_RESET,
IRC_COLOR_CHAT_SERVER,
@@ -524,8 +523,7 @@ irc_notify_display (struct t_irc_server *server, struct t_gui_buffer *buffer,
{
weechat_printf (buffer,
" %s%s%s @ %s%s%s: %s%s %s%s%s%s%s%s",
irc_nick_color_for_server_message (server, NULL,
notify->nick),
irc_nick_color_for_msg (server, 1, NULL, notify->nick),
notify->nick,
IRC_COLOR_RESET,
IRC_COLOR_CHAT_SERVER,
@@ -684,9 +682,8 @@ irc_notify_set_is_on_server (struct t_irc_notify *notify, const char *host,
_("%snotify: %s%s%s%s%s%s%s%s%s has connected") :
_("%snotify: %s%s%s%s%s%s%s%s%s has quit")),
weechat_prefix ("network"),
irc_nick_color_for_server_message (notify->server,
NULL,
notify->nick),
irc_nick_color_for_msg (notify->server, 1, NULL,
notify->nick),
notify->nick,
(host && host[0]) ? IRC_COLOR_CHAT_DELIMITERS : "",
(host && host[0]) ? " (" : "",
@@ -726,9 +723,8 @@ irc_notify_set_away_message (struct t_irc_notify *notify,
notify->nick),
_("%snotify: %s%s%s is now away: \"%s\""),
weechat_prefix ("network"),
irc_nick_color_for_server_message (notify->server,
NULL,
notify->nick),
irc_nick_color_for_msg (notify->server, 1, NULL,
notify->nick),
notify->nick,
IRC_COLOR_RESET,
away_message);
@@ -742,9 +738,8 @@ irc_notify_set_away_message (struct t_irc_notify *notify,
notify->nick),
_("%snotify: %s%s%s is back"),
weechat_prefix ("network"),
irc_nick_color_for_server_message (notify->server,
NULL,
notify->nick),
irc_nick_color_for_msg (notify->server, 1, NULL,
notify->nick),
notify->nick,
IRC_COLOR_RESET);
irc_notify_send_signal (notify, "back", NULL);
@@ -757,9 +752,8 @@ irc_notify_set_away_message (struct t_irc_notify *notify,
notify->nick),
_("%snotify: %s%s%s is still away: \"%s\""),
weechat_prefix ("network"),
irc_nick_color_for_server_message (notify->server,
NULL,
notify->nick),
irc_nick_color_for_msg (notify->server, 1, NULL,
notify->nick),
notify->nick,
IRC_COLOR_RESET,
away_message);