diff options
| -rw-r--r-- | src/plugins/irc/irc-command.c | 29 | ||||
| -rw-r--r-- | src/plugins/irc/irc-ctcp.c | 5 | ||||
| -rw-r--r-- | src/plugins/irc/irc-input.c | 2 | ||||
| -rw-r--r-- | src/plugins/irc/irc-protocol.c | 2 |
4 files changed, 20 insertions, 18 deletions
diff --git a/src/plugins/irc/irc-command.c b/src/plugins/irc/irc-command.c index aff76d9da..4d3c0837b 100644 --- a/src/plugins/irc/irc-command.c +++ b/src/plugins/irc/irc-command.c @@ -353,9 +353,9 @@ irc_command_me_channel (struct t_irc_server *server, weechat_config_boolean (irc_config_network_colors_receive)) : NULL; weechat_printf_tags (channel->buffer, irc_protocol_tags ("privmsg", - "irc_action,no_highlight", + "irc_action,notify_none,no_highlight", server->nick), - "%s%s%s %s%s", + "%s%s%s%s %s", weechat_prefix ("action"), IRC_COLOR_CHAT_NICK_SELF, server->nick, @@ -2675,18 +2675,19 @@ irc_command_notice (void *data, struct t_gui_buffer *buffer, int argc, string = irc_color_decode (argv_eol[arg_text], weechat_config_boolean (irc_config_network_colors_receive)); ptr_channel = irc_channel_search (ptr_server, argv[arg_nick]); - weechat_printf ((ptr_channel) ? ptr_channel->buffer : ptr_server->buffer, - "%s%s%s%s -> %s%s%s: %s", - weechat_prefix ("network"), - IRC_COLOR_NOTICE, - /* TRANSLATORS: "Notice" is command name in IRC protocol (translation is frequently the same word) */ - _("Notice"), - IRC_COLOR_CHAT, - (irc_channel_is_channel (argv[arg_nick])) ? - IRC_COLOR_CHAT_CHANNEL : IRC_COLOR_CHAT_NICK, - argv[arg_nick], - IRC_COLOR_CHAT, - (string) ? string : argv_eol[arg_text]); + weechat_printf_tags ((ptr_channel) ? ptr_channel->buffer : ptr_server->buffer, + "notify_none,no_highlight", + "%s%s%s%s -> %s%s%s: %s", + weechat_prefix ("network"), + IRC_COLOR_NOTICE, + /* TRANSLATORS: "Notice" is command name in IRC protocol (translation is frequently the same word) */ + _("Notice"), + IRC_COLOR_CHAT, + (irc_channel_is_channel (argv[arg_nick])) ? + IRC_COLOR_CHAT_CHANNEL : IRC_COLOR_CHAT_NICK, + argv[arg_nick], + IRC_COLOR_CHAT, + (string) ? string : argv_eol[arg_text]); if (string) free (string); irc_server_sendf (ptr_server, IRC_SERVER_SEND_OUTQ_PRIO_HIGH, NULL, diff --git a/src/plugins/irc/irc-ctcp.c b/src/plugins/irc/irc-ctcp.c index 97deb31e7..0ef182445 100644 --- a/src/plugins/irc/irc-ctcp.c +++ b/src/plugins/irc/irc-ctcp.c @@ -263,7 +263,8 @@ irc_ctcp_reply_to_nick (struct t_irc_server *server, { weechat_printf_tags ((channel) ? channel->buffer : server->buffer, irc_protocol_tags (command, - "irc_ctcp,irc_ctcp_reply,no_highlight", + "irc_ctcp,irc_ctcp_reply," + "notify_none,no_highlight", NULL), _("%sCTCP reply to %s%s%s: %s%s%s%s%s"), weechat_prefix ("network"), @@ -931,7 +932,7 @@ irc_ctcp_recv (struct t_irc_server *server, const char *command, weechat_printf_tags (ptr_channel->buffer, irc_protocol_tags (command, (nick_is_me) ? - "irc_action,notify_private,no_highlight" : + "irc_action,notify_none,no_highlight" : "irc_action,notify_private", nick), "%s%s%s%s%s%s", diff --git a/src/plugins/irc/irc-input.c b/src/plugins/irc/irc-input.c index 071e50c38..cce50d1f7 100644 --- a/src/plugins/irc/irc-input.c +++ b/src/plugins/irc/irc-input.c @@ -60,7 +60,7 @@ irc_input_user_message_display (struct t_gui_buffer *buffer, const char *text) weechat_printf_tags (buffer, irc_protocol_tags ("privmsg", - "notify_message,no_highlight", + "notify_none,no_highlight", (ptr_nick) ? ptr_nick->name : ptr_server->nick), "%s%s", irc_nick_as_prefix (ptr_server, diff --git a/src/plugins/irc/irc-protocol.c b/src/plugins/irc/irc-protocol.c index 7e1b5f393..5bc259e46 100644 --- a/src/plugins/irc/irc-protocol.c +++ b/src/plugins/irc/irc-protocol.c @@ -1446,7 +1446,7 @@ IRC_PROTOCOL_CALLBACK(privmsg) weechat_printf_tags (ptr_channel->buffer, irc_protocol_tags (command, (nick_is_me) ? - "notify_private,no_highlight" : + "notify_none,no_highlight" : "notify_private", nick), "%s%s", |