summaryrefslogtreecommitdiff
path: root/src/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/irc/irc-color.h2
-rw-r--r--src/plugins/irc/irc-command.c42
-rw-r--r--src/plugins/irc/irc-ctcp.c28
-rw-r--r--src/plugins/irc/irc-display.c15
-rw-r--r--src/plugins/irc/irc-nick.c4
-rw-r--r--src/plugins/irc/irc-notify.c18
-rw-r--r--src/plugins/irc/irc-protocol.c190
7 files changed, 149 insertions, 150 deletions
diff --git a/src/plugins/irc/irc-color.h b/src/plugins/irc/irc-color.h
index ad9b4c305..e1d73a809 100644
--- a/src/plugins/irc/irc-color.h
+++ b/src/plugins/irc/irc-color.h
@@ -60,7 +60,7 @@
#define IRC_COLOR_BAR_FG weechat_color("bar_fg")
#define IRC_COLOR_BAR_BG weechat_color("bar_bg")
#define IRC_COLOR_BAR_DELIM weechat_color("bar_delim")
-#define IRC_COLOR_CHAT weechat_color("chat")
+#define IRC_COLOR_RESET weechat_color("reset")
#define IRC_COLOR_CHAT_CHANNEL weechat_color("chat_channel")
#define IRC_COLOR_CHAT_DELIMITERS weechat_color("chat_delimiters")
#define IRC_COLOR_CHAT_HOST weechat_color("chat_host")
diff --git a/src/plugins/irc/irc-command.c b/src/plugins/irc/irc-command.c
index 3790177a4..072e304a9 100644
--- a/src/plugins/irc/irc-command.c
+++ b/src/plugins/irc/irc-command.c
@@ -355,7 +355,7 @@ irc_command_me_channel_display (struct t_irc_server *server,
weechat_prefix ("action"),
IRC_COLOR_CHAT_NICK_SELF,
server->nick,
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
(string) ? string : "");
if (string)
free (string);
@@ -854,7 +854,7 @@ irc_command_connect (void *data, struct t_gui_buffer *buffer, int argc,
IRC_PLUGIN_NAME,
IRC_COLOR_CHAT_SERVER,
ptr_server->name,
- IRC_COLOR_CHAT);
+ IRC_COLOR_RESET);
irc_server_apply_command_line_options (ptr_server,
argc, argv);
if (!irc_command_connect_one_server (ptr_server, 0, 0))
@@ -928,10 +928,10 @@ irc_command_ctcp (void *data, struct t_gui_buffer *buffer, int argc,
weechat_prefix ("network"),
IRC_COLOR_CHAT_NICK,
argv[1],
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
IRC_COLOR_CHAT_CHANNEL,
irc_cmd,
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
" ",
str_time);
}
@@ -948,10 +948,10 @@ irc_command_ctcp (void *data, struct t_gui_buffer *buffer, int argc,
weechat_prefix ("network"),
IRC_COLOR_CHAT_NICK,
argv[1],
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
IRC_COLOR_CHAT_CHANNEL,
irc_cmd,
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
(argv_eol[3]) ? " " : "",
(argv_eol[3]) ? argv_eol[3] : "");
}
@@ -1514,10 +1514,10 @@ irc_command_ignore_display (struct t_irc_ignore *ignore)
weechat_printf (NULL,
_(" %s[%s%d%s]%s mask: %s / server: %s / channel: %s"),
IRC_COLOR_CHAT_DELIMITERS,
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
ignore->number,
IRC_COLOR_CHAT_DELIMITERS,
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
(mask) ? mask : ignore->mask,
(ignore->server) ? ignore->server : "*",
(ignore->channel) ? ignore->channel : "*");
@@ -2559,7 +2559,7 @@ irc_command_msg (void *data, struct t_gui_buffer *buffer, int argc,
IRC_COLOR_CHAT_NICK,
targets[i],
IRC_COLOR_CHAT_DELIMITERS,
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
(string) ?
string : ((msg_pwd_hidden) ?
msg_pwd_hidden : argv_eol[arg_text]));
@@ -2591,7 +2591,7 @@ irc_command_msg (void *data, struct t_gui_buffer *buffer, int argc,
IRC_COLOR_CHAT_NICK,
targets[i],
IRC_COLOR_CHAT_DELIMITERS,
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
(string) ? string : argv_eol[arg_text]);
}
if (string)
@@ -2767,11 +2767,11 @@ irc_command_notice (void *data, struct t_gui_buffer *buffer, int argc,
IRC_COLOR_NOTICE,
/* TRANSLATORS: "Notice" is command name in IRC protocol (translation is frequently the same word) */
_("Notice"),
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
(irc_channel_is_channel (argv[arg_nick])) ?
IRC_COLOR_CHAT_CHANNEL : IRC_COLOR_CHAT_NICK,
argv[arg_nick],
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
(string) ? string : str_args);
if (string)
free (string);
@@ -3748,7 +3748,7 @@ irc_command_server (void *data, struct t_gui_buffer *buffer, int argc,
IRC_PLUGIN_NAME,
IRC_COLOR_CHAT_SERVER,
new_server->name,
- IRC_COLOR_CHAT);
+ IRC_COLOR_RESET);
/* do not connect to server after creating it */
/*
@@ -3799,10 +3799,10 @@ irc_command_server (void *data, struct t_gui_buffer *buffer, int argc,
IRC_PLUGIN_NAME,
IRC_COLOR_CHAT_SERVER,
argv[2],
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
IRC_COLOR_CHAT_SERVER,
argv[3],
- IRC_COLOR_CHAT);
+ IRC_COLOR_RESET);
return WEECHAT_RC_OK;
}
@@ -3848,10 +3848,10 @@ irc_command_server (void *data, struct t_gui_buffer *buffer, int argc,
IRC_PLUGIN_NAME,
IRC_COLOR_CHAT_SERVER,
argv[2],
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
IRC_COLOR_CHAT_SERVER,
argv[3],
- IRC_COLOR_CHAT);
+ IRC_COLOR_RESET);
return WEECHAT_RC_OK;
}
@@ -3895,7 +3895,7 @@ irc_command_server (void *data, struct t_gui_buffer *buffer, int argc,
IRC_PLUGIN_NAME,
IRC_COLOR_CHAT_SERVER,
argv[2],
- IRC_COLOR_CHAT);
+ IRC_COLOR_RESET);
return WEECHAT_RC_OK;
}
@@ -3936,7 +3936,7 @@ irc_command_server (void *data, struct t_gui_buffer *buffer, int argc,
IRC_PLUGIN_NAME,
IRC_COLOR_CHAT_SERVER,
(server_name) ? server_name : "???",
- IRC_COLOR_CHAT);
+ IRC_COLOR_RESET);
if (server_name)
free (server_name);
@@ -4552,10 +4552,10 @@ irc_command_wallchops (void *data, struct t_gui_buffer *buffer, int argc,
IRC_COLOR_NOTICE,
/* TRANSLATORS: "Notice" is command name in IRC protocol (translation is frequently the same word) */
_("Notice"),
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
IRC_COLOR_CHAT_CHANNEL,
ptr_channel->name,
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
argv_eol[pos_args]);
support_wallchops = irc_server_get_isupport_value (ptr_server,
diff --git a/src/plugins/irc/irc-ctcp.c b/src/plugins/irc/irc-ctcp.c
index 0af20ddfb..e4202698c 100644
--- a/src/plugins/irc/irc-ctcp.c
+++ b/src/plugins/irc/irc-ctcp.c
@@ -126,10 +126,10 @@ irc_ctcp_display_request (struct t_irc_server *server,
weechat_prefix ("network"),
IRC_COLOR_CHAT_NICK,
nick,
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
IRC_COLOR_CHAT_CHANNEL,
ctcp,
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
(arguments) ? " " : "",
(arguments) ? arguments : "",
(reply && !reply[0]) ? _(" (blocked)") : "");
@@ -188,10 +188,10 @@ irc_ctcp_display_reply_from_nick (struct t_irc_server *server,
weechat_prefix ("network"),
IRC_COLOR_CHAT_NICK,
nick,
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
IRC_COLOR_CHAT_CHANNEL,
arguments + 1,
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
difftime / 1000000,
(difftime % 1000000) / 1000,
(NG_("second", "seconds",
@@ -210,10 +210,10 @@ irc_ctcp_display_reply_from_nick (struct t_irc_server *server,
weechat_prefix ("network"),
IRC_COLOR_CHAT_NICK,
nick,
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
IRC_COLOR_CHAT_CHANNEL,
arguments + 1,
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
" ",
pos_args);
}
@@ -227,7 +227,7 @@ irc_ctcp_display_reply_from_nick (struct t_irc_server *server,
weechat_prefix ("network"),
IRC_COLOR_CHAT_NICK,
nick,
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
IRC_COLOR_CHAT_CHANNEL,
arguments + 1,
"",
@@ -286,10 +286,10 @@ irc_ctcp_reply_to_nick (struct t_irc_server *server,
weechat_prefix ("network"),
IRC_COLOR_CHAT_NICK,
nick,
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
IRC_COLOR_CHAT_CHANNEL,
ctcp,
- (str_args[0]) ? IRC_COLOR_CHAT : "",
+ (str_args[0]) ? IRC_COLOR_RESET : "",
(str_args[0]) ? " " : "",
str_args);
number++;
@@ -823,7 +823,7 @@ irc_ctcp_recv_dcc (struct t_irc_server *server, const char *nick,
IRC_PLUGIN_NAME,
IRC_COLOR_CHAT_NICK,
nick,
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
pos_file);
free (dcc_args);
return;
@@ -922,7 +922,7 @@ irc_ctcp_recv (struct t_irc_server *server, const char *command,
weechat_prefix ("action"),
(ptr_nick) ? ptr_nick->color : ((nick) ? irc_nick_find_color (nick) : IRC_COLOR_CHAT_NICK),
nick,
- (pos_args) ? IRC_COLOR_CHAT : "",
+ (pos_args) ? IRC_COLOR_RESET : "",
(pos_args) ? " " : "",
(pos_args) ? pos_args : "");
}
@@ -960,7 +960,7 @@ irc_ctcp_recv (struct t_irc_server *server, const char *command,
(nick_is_me) ?
IRC_COLOR_CHAT_NICK_SELF : irc_nick_color_for_pv (ptr_channel, nick),
nick,
- (pos_args) ? IRC_COLOR_CHAT : "",
+ (pos_args) ? IRC_COLOR_RESET : "",
(pos_args) ? " " : "",
(pos_args) ? pos_args : "");
weechat_hook_signal_send ("irc_pv",
@@ -1019,10 +1019,10 @@ irc_ctcp_recv (struct t_irc_server *server, const char *command,
weechat_prefix ("network"),
IRC_COLOR_CHAT_NICK,
nick,
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
IRC_COLOR_CHAT_CHANNEL,
arguments + 1,
- (pos_args) ? IRC_COLOR_CHAT : "",
+ (pos_args) ? IRC_COLOR_RESET : "",
(pos_args) ? " " : "",
(pos_args) ? pos_args : "");
}
diff --git a/src/plugins/irc/irc-display.c b/src/plugins/irc/irc-display.c
index a1ce8f6dd..6e6962593 100644
--- a/src/plugins/irc/irc-display.c
+++ b/src/plugins/irc/irc-display.c
@@ -144,7 +144,7 @@ irc_display_away (struct t_irc_server *server, const char *string1,
IRC_COLOR_CHAT_DELIMITERS,
IRC_COLOR_CHAT_NICK,
server->nick,
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
string1,
string2,
IRC_COLOR_CHAT_DELIMITERS);
@@ -165,16 +165,15 @@ irc_display_server (struct t_irc_server *server, int with_detail)
if (with_detail)
{
weechat_printf (NULL, "");
- weechat_printf (NULL, _("%sServer: %s%s %s[%s%s%s]%s%s"),
- IRC_COLOR_CHAT,
+ weechat_printf (NULL, _("Server: %s%s %s[%s%s%s]%s%s"),
IRC_COLOR_CHAT_SERVER,
server->name,
IRC_COLOR_CHAT_DELIMITERS,
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
(server->is_connected) ?
_("connected") : _("not connected"),
IRC_COLOR_CHAT_DELIMITERS,
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
(server->temp_server) ? _(" (temporary)") : "");
/* addresses */
if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_ADDRESSES]))
@@ -476,11 +475,11 @@ irc_display_server (struct t_irc_server *server, int with_detail)
IRC_COLOR_CHAT_SERVER,
server->name,
IRC_COLOR_CHAT_DELIMITERS,
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
(server->is_connected) ?
_("connected") : _("not connected"),
IRC_COLOR_CHAT_DELIMITERS,
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
(server->temp_server) ? _(" (temporary)") : "",
num_channels,
NG_("channel", "channels", num_channels),
@@ -491,7 +490,7 @@ irc_display_server (struct t_irc_server *server, int with_detail)
weechat_printf (NULL, " %s%s%s%s",
IRC_COLOR_CHAT_SERVER,
server->name,
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
(server->temp_server) ? _(" (temporary)") : "");
}
}
diff --git a/src/plugins/irc/irc-nick.c b/src/plugins/irc/irc-nick.c
index 9656ff409..eeb7042bf 100644
--- a/src/plugins/irc/irc-nick.c
+++ b/src/plugins/irc/irc-nick.c
@@ -881,13 +881,13 @@ irc_nick_as_prefix (struct t_irc_server *server, struct t_irc_nick *nick,
{
prefix[0] = (weechat_config_boolean (weechat_config_get ("weechat.look.nickmode_empty"))) ?
' ' : '\0';
- str_prefix_color = IRC_COLOR_CHAT;
+ str_prefix_color = IRC_COLOR_RESET;
}
}
else
{
prefix[0] = '\0';
- str_prefix_color = IRC_COLOR_CHAT;
+ str_prefix_color = IRC_COLOR_RESET;
}
snprintf (result, sizeof (result), "%s%s%s%s%s%s%s%s\t",
diff --git a/src/plugins/irc/irc-notify.c b/src/plugins/irc/irc-notify.c
index a1d1ceb27..3ed15fb5b 100644
--- a/src/plugins/irc/irc-notify.c
+++ b/src/plugins/irc/irc-notify.c
@@ -338,10 +338,10 @@ irc_notify_display (struct t_gui_buffer *buffer, struct t_irc_notify *notify)
" %s%s%s @ %s%s%s: %s%s",
IRC_COLOR_CHAT_NICK,
notify->nick,
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
IRC_COLOR_CHAT_SERVER,
notify->server->name,
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
IRC_COLOR_MESSAGE_QUIT,
_("offline"));
}
@@ -351,13 +351,13 @@ irc_notify_display (struct t_gui_buffer *buffer, struct t_irc_notify *notify)
" %s%s%s @ %s%s%s: %s%s %s%s%s%s%s%s",
IRC_COLOR_CHAT_NICK,
notify->nick,
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
IRC_COLOR_CHAT_SERVER,
notify->server->name,
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
IRC_COLOR_MESSAGE_JOIN,
_("online"),
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
(notify->away_message) ? " (" : "",
(notify->away_message) ? _("away") : "",
(notify->away_message) ? ": \"" : "",
@@ -387,7 +387,7 @@ irc_notify_display_list (struct t_irc_server *server)
_("Notify list for %s%s%s:"),
IRC_COLOR_CHAT_SERVER,
server->name,
- IRC_COLOR_CHAT);
+ IRC_COLOR_RESET);
for (ptr_notify = server->notify_list; ptr_notify;
ptr_notify = ptr_notify->next_notify)
{
@@ -504,7 +504,7 @@ irc_notify_set_away_message (struct t_irc_notify *notify,
weechat_prefix ("network"),
IRC_COLOR_CHAT_NICK,
notify->nick,
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
away_message);
}
else if (notify->away_message && !away_message)
@@ -515,7 +515,7 @@ irc_notify_set_away_message (struct t_irc_notify *notify,
weechat_prefix ("network"),
IRC_COLOR_CHAT_NICK,
notify->nick,
- IRC_COLOR_CHAT);
+ IRC_COLOR_RESET);
}
else if (notify->away_message && away_message)
{
@@ -525,7 +525,7 @@ irc_notify_set_away_message (struct t_irc_notify *notify,
weechat_prefix ("network"),
IRC_COLOR_CHAT_NICK,
notify->nick,
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
away_message);
}
diff --git a/src/plugins/irc/irc-protocol.c b/src/plugins/irc/irc-protocol.c
index 0d9dace75..f31c0d293 100644
--- a/src/plugins/irc/irc-protocol.c
+++ b/src/plugins/irc/irc-protocol.c
@@ -396,7 +396,7 @@ IRC_PROTOCOL_CALLBACK(generic_error)
&& (strcmp (chan_nick, ptr_channel->name) == 0)) ?
IRC_COLOR_CHAT_CHANNEL : "",
(chan_nick) ? chan_nick : "",
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
(chan_nick) ? ": " : "",
args);
@@ -428,10 +428,10 @@ IRC_PROTOCOL_CALLBACK(invite)
weechat_prefix ("network"),
IRC_COLOR_CHAT_CHANNEL,
(argv[3][0] == ':') ? argv[3] + 1 : argv[3],
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
IRC_COLOR_CHAT_NICK,
nick,
- IRC_COLOR_CHAT);
+ IRC_COLOR_RESET);
}
return WEECHAT_RC_OK;
}
@@ -584,7 +584,7 @@ IRC_PROTOCOL_CALLBACK(kick)
argv[3],
IRC_COLOR_MESSAGE_QUIT,
IRC_COLOR_CHAT_DELIMITERS,
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
pos_comment,
IRC_COLOR_CHAT_DELIMITERS);
}
@@ -685,7 +685,7 @@ IRC_PROTOCOL_CALLBACK(kill)
nick,
IRC_COLOR_MESSAGE_QUIT,
IRC_COLOR_CHAT_DELIMITERS,
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
pos_comment,
IRC_COLOR_CHAT_DELIMITERS);
}
@@ -771,10 +771,10 @@ IRC_PROTOCOL_CALLBACK(mode)
IRC_COLOR_CHAT_CHANNEL,
(ptr_channel) ? ptr_channel->name : argv[2],
IRC_COLOR_CHAT_DELIMITERS,
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
pos_modes,
IRC_COLOR_CHAT_DELIMITERS,
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
IRC_COLOR_NICK_IN_SERVER_MESSAGE(ptr_nick),
nick);
}
@@ -790,10 +790,10 @@ IRC_PROTOCOL_CALLBACK(mode)
_("%sUser mode %s[%s%s%s]%s by %s%s"),
weechat_prefix ("network"),
IRC_COLOR_CHAT_DELIMITERS,
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
pos_modes,
IRC_COLOR_CHAT_DELIMITERS,
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
IRC_COLOR_CHAT_NICK,
nick);
}
@@ -879,7 +879,7 @@ IRC_PROTOCOL_CALLBACK(nick)
weechat_prefix ("network"),
IRC_COLOR_CHAT_NICK_SELF,
new_nick,
- IRC_COLOR_CHAT);
+ IRC_COLOR_RESET);
}
else
{
@@ -902,10 +902,10 @@ IRC_PROTOCOL_CALLBACK(nick)
weechat_config_boolean(irc_config_look_color_nicks_in_server_messages) ?
old_color : IRC_COLOR_CHAT_NICK,
nick,
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
IRC_COLOR_NICK_IN_SERVER_MESSAGE(ptr_nick),
new_nick,
- IRC_COLOR_CHAT);
+ IRC_COLOR_RESET);
}
irc_channel_nick_speaking_rename (ptr_channel,
nick, new_nick);
@@ -999,7 +999,7 @@ IRC_PROTOCOL_CALLBACK(notice)
IRC_COLOR_NICK_IN_SERVER_MESSAGE(ptr_nick),
(nick && nick[0]) ? nick : "?",
IRC_COLOR_CHAT_DELIMITERS,
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
pos_args);
}
else
@@ -1048,7 +1048,7 @@ IRC_PROTOCOL_CALLBACK(notice)
weechat_prefix ("network"),
IRC_COLOR_CHAT_NICK,
nick,
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
pos_args);
if ((ptr_channel->type == IRC_CHANNEL_TYPE_PRIVATE)
&& ptr_channel->has_quit_server)
@@ -1076,10 +1076,10 @@ IRC_PROTOCOL_CALLBACK(notice)
IRC_COLOR_NOTICE,
/* TRANSLATORS: "Notice" is command name in IRC protocol (translation is frequently the same word) */
_("Notice"),
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
IRC_COLOR_CHAT_NICK,
pos_target,
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
pos_args);
}
else
@@ -1098,7 +1098,7 @@ IRC_PROTOCOL_CALLBACK(notice)
IRC_COLOR_CHAT_HOST,
address,
IRC_COLOR_CHAT_DELIMITERS,
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
pos_args);
}
else
@@ -1113,7 +1113,7 @@ IRC_PROTOCOL_CALLBACK(notice)
weechat_prefix ("network"),
IRC_COLOR_CHAT_NICK,
nick,
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
pos_args);
}
else
@@ -1701,16 +1701,16 @@ IRC_PROTOCOL_CALLBACK(topic)
weechat_prefix ("network"),
IRC_COLOR_NICK_IN_SERVER_MESSAGE(ptr_nick),
nick,
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
IRC_COLOR_CHAT_CHANNEL,
argv[2],
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
IRC_COLOR_TOPIC_OLD,
(old_topic_color) ? old_topic_color : ptr_channel->topic,
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
IRC_COLOR_TOPIC_NEW,
(topic_color) ? topic_color : pos_topic,
- IRC_COLOR_CHAT);
+ IRC_COLOR_RESET);
if (old_topic_color)
free (old_topic_color);
}
@@ -1725,13 +1725,13 @@ IRC_PROTOCOL_CALLBACK(topic)
weechat_prefix ("network"),
IRC_COLOR_NICK_IN_SERVER_MESSAGE(ptr_nick),
nick,
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
IRC_COLOR_CHAT_CHANNEL,
argv[2],
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
IRC_COLOR_TOPIC_NEW,
(topic_color) ? topic_color : pos_topic,
- IRC_COLOR_CHAT);
+ IRC_COLOR_RESET);
}
if (topic_color)
free (topic_color);
@@ -1752,13 +1752,13 @@ IRC_PROTOCOL_CALLBACK(topic)
weechat_prefix ("network"),
IRC_COLOR_NICK_IN_SERVER_MESSAGE(ptr_nick),
nick,
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
IRC_COLOR_CHAT_CHANNEL,
argv[2],
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
IRC_COLOR_TOPIC_OLD,
(old_topic_color) ? old_topic_color : ptr_channel->topic,
- IRC_COLOR_CHAT);
+ IRC_COLOR_RESET);
if (old_topic_color)
free (old_topic_color);
}
@@ -1772,10 +1772,10 @@ IRC_PROTOCOL_CALLBACK(topic)
weechat_prefix ("network"),
IRC_COLOR_NICK_IN_SERVER_MESSAGE(ptr_nick),
nick,
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
IRC_COLOR_CHAT_CHANNEL,
argv[2],
- IRC_COLOR_CHAT);
+ IRC_COLOR_RESET);
}
}
}
@@ -1814,7 +1814,7 @@ IRC_PROTOCOL_CALLBACK(wallops)
IRC_COLOR_CHAT_HOST,
address,
IRC_COLOR_CHAT_DELIMITERS,
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
(argv_eol[2][0] == ':') ? argv_eol[2] + 1 : argv_eol[2]);
return WEECHAT_RC_OK;
@@ -2007,9 +2007,9 @@ IRC_PROTOCOL_CALLBACK(221)
weechat_prefix ("network"),
IRC_COLOR_CHAT_NICK,
argv[2],
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
IRC_COLOR_CHAT_DELIMITERS,
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
(argv_eol[3][0] == ':') ? argv_eol[3] + 1 : argv_eol[3],
IRC_COLOR_CHAT_DELIMITERS);
@@ -2061,7 +2061,7 @@ IRC_PROTOCOL_CALLBACK(301)
IRC_COLOR_CHAT_NICK,
argv[3],
IRC_COLOR_CHAT_DELIMITERS,
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
pos_away_msg);
if (ptr_channel)
{
@@ -2186,7 +2186,7 @@ IRC_PROTOCOL_CALLBACK(whois_nick_msg)
IRC_COLOR_CHAT_NICK,
argv[3],
IRC_COLOR_CHAT_DELIMITERS,
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
(argv_eol[4][0] == ':') ? argv_eol[4] + 1 : argv_eol[4]);
return WEECHAT_RC_OK;
@@ -2215,7 +2215,7 @@ IRC_PROTOCOL_CALLBACK(whowas_nick_msg)
IRC_COLOR_CHAT_NICK,
argv[3],
IRC_COLOR_CHAT_DELIMITERS,
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
(argv_eol[4][0] == ':') ? argv_eol[4] + 1 : argv_eol[4]);
return WEECHAT_RC_OK;
@@ -2248,7 +2248,7 @@ IRC_PROTOCOL_CALLBACK(311)
argv[4],
argv[5],
IRC_COLOR_CHAT_DELIMITERS,
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
(argv_eol[7][0] == ':') ? argv_eol[7] + 1 : argv_eol[7]);
return WEECHAT_RC_OK;
@@ -2277,10 +2277,10 @@ IRC_PROTOCOL_CALLBACK(312)
IRC_COLOR_CHAT_NICK,
argv[3],
IRC_COLOR_CHAT_DELIMITERS,
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
argv[4],
IRC_COLOR_CHAT_DELIMITERS,
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
(argv_eol[5][0] == ':') ? argv_eol[5] + 1 : argv_eol[5],
IRC_COLOR_CHAT_DELIMITERS);
@@ -2314,7 +2314,7 @@ IRC_PROTOCOL_CALLBACK(314)
argv[4],
argv[5],
IRC_COLOR_CHAT_DELIMITERS,
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
(argv_eol[7][0] == ':') ? argv_eol[7] + 1 : argv_eol[7]);
return WEECHAT_RC_OK;
@@ -2352,7 +2352,7 @@ IRC_PROTOCOL_CALLBACK(315)
IRC_COLOR_CHAT_CHANNEL,
argv[3],
IRC_COLOR_CHAT_DELIMITERS,
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
(argv_eol[4][0] == ':') ? argv_eol[4] + 1 : argv_eol[4]);
}
@@ -2399,22 +2399,22 @@ IRC_PROTOCOL_CALLBACK(317)
IRC_COLOR_CHAT_NICK,
argv[3],
IRC_COLOR_CHAT_DELIMITERS,
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
IRC_COLOR_CHAT_CHANNEL,
day,
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
NG_("day", "days", day),
IRC_COLOR_CHAT_CHANNEL,
hour,
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
NG_("hour", "hours", hour),
IRC_COLOR_CHAT_CHANNEL,
min,
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
NG_("minute", "minutes", min),
IRC_COLOR_CHAT_CHANNEL,
sec,
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
NG_("second", "seconds", sec),
IRC_COLOR_CHAT_CHANNEL,
weechat_util_get_time_string (&datetime));
@@ -2431,18 +2431,18 @@ IRC_PROTOCOL_CALLBACK(317)
IRC_COLOR_CHAT_NICK,
argv[3],
IRC_COLOR_CHAT_DELIMITERS,
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
IRC_COLOR_CHAT_CHANNEL,
hour,
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
NG_("hour", "hours", hour),
IRC_COLOR_CHAT_CHANNEL,
min,
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
NG_("minute", "minutes", min),
IRC_COLOR_CHAT_CHANNEL,
sec,
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
NG_("second", "seconds", sec),
IRC_COLOR_CHAT_CHANNEL,
weechat_util_get_time_string (&datetime));
@@ -2512,10 +2512,10 @@ IRC_PROTOCOL_CALLBACK(322)
IRC_COLOR_CHAT_CHANNEL,
argv[3],
IRC_COLOR_CHAT_DELIMITERS,
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
argv[4],
IRC_COLOR_CHAT_DELIMITERS,
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
(pos_topic && pos_topic[0]) ? ": " : "",
(pos_topic && pos_topic[0]) ? pos_topic : "");
}
@@ -2598,7 +2598,7 @@ IRC_PROTOCOL_CALLBACK(324)
IRC_COLOR_CHAT_CHANNEL,
argv[3],
IRC_COLOR_CHAT_DELIMITERS,
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
(argc > 4) ?
((argv_eol[4][0] == ':') ? argv_eol[4] + 1 : argv_eol[4]) : "",
IRC_COLOR_CHAT_DELIMITERS);
@@ -2643,7 +2643,7 @@ IRC_PROTOCOL_CALLBACK(327)
argv[4],
argv[5],
IRC_COLOR_CHAT_DELIMITERS,
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
pos_realname,
IRC_COLOR_CHAT_DELIMITERS);
}
@@ -2691,7 +2691,7 @@ IRC_PROTOCOL_CALLBACK(328)
weechat_prefix ("network"),
IRC_COLOR_CHAT_CHANNEL,
argv[3],
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
(argv_eol[4][0] == ':') ?
argv_eol[4] + 1 : argv_eol[4]);
}
@@ -2746,7 +2746,7 @@ IRC_PROTOCOL_CALLBACK(329)
weechat_prefix ("network"),
IRC_COLOR_CHAT_CHANNEL,
argv[3],
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
weechat_util_get_time_string (&datetime));
}
@@ -2786,7 +2786,7 @@ IRC_PROTOCOL_CALLBACK(330_343)
IRC_COLOR_CHAT_NICK,
argv[3],
IRC_COLOR_CHAT_DELIMITERS,
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
(argv_eol[5][0] == ':') ? argv_eol[5] + 1 : argv_eol[5],
IRC_COLOR_CHAT_NICK,
argv[4]);
@@ -2806,7 +2806,7 @@ IRC_PROTOCOL_CALLBACK(330_343)
IRC_COLOR_CHAT_NICK,
argv[3],
IRC_COLOR_CHAT_DELIMITERS,
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
(argv_eol[4][0] == ':') ? argv_eol[4] + 1 : argv_eol[4]);
}
@@ -2896,9 +2896,9 @@ IRC_PROTOCOL_CALLBACK(332)
weechat_prefix ("network"),
IRC_COLOR_CHAT_CHANNEL,
argv[3],
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
(topic_color) ? topic_color : ((pos_topic) ? pos_topic : ""),
- IRC_COLOR_CHAT);
+ IRC_COLOR_RESET);
if (topic_color)
free (topic_color);
@@ -2959,7 +2959,7 @@ IRC_PROTOCOL_CALLBACK(333)
(topic_address) ? topic_address : "",
IRC_COLOR_CHAT_DELIMITERS,
(topic_address && topic_address[0]) ? ")" : "",
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
weechat_util_get_time_string (&datetime));
}
else
@@ -2987,7 +2987,7 @@ IRC_PROTOCOL_CALLBACK(333)
weechat_prefix ("network"),
IRC_COLOR_CHAT_CHANNEL,
argv[3],
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
IRC_COLOR_NICK_IN_SERVER_MESSAGE(ptr_nick),
topic_nick,
IRC_COLOR_CHAT_DELIMITERS,
@@ -2996,7 +2996,7 @@ IRC_PROTOCOL_CALLBACK(333)
(topic_address) ? topic_address : "",
IRC_COLOR_CHAT_DELIMITERS,
(topic_address && topic_address[0]) ? ")" : "",
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
weechat_util_get_time_string (&datetime));
}
else
@@ -3010,7 +3010,7 @@ IRC_PROTOCOL_CALLBACK(333)
weechat_prefix ("network"),
IRC_COLOR_CHAT_CHANNEL,
argv[3],
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
weechat_util_get_time_string (&datetime));
}
}
@@ -3041,7 +3041,7 @@ IRC_PROTOCOL_CALLBACK(338)
IRC_COLOR_CHAT_NICK,
argv[3],
IRC_COLOR_CHAT_DELIMITERS,
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
(argv_eol[5][0] == ':') ? argv_eol[5] + 1 : argv_eol[5],
IRC_COLOR_CHAT_HOST,
argv[4]);
@@ -3069,13 +3069,13 @@ IRC_PROTOCOL_CALLBACK(341)
weechat_prefix ("network"),
IRC_COLOR_CHAT_NICK,
argv[2],
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
IRC_COLOR_CHAT_NICK,
argv[3],
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
IRC_COLOR_CHAT_CHANNEL,
argv[4],
- IRC_COLOR_CHAT);
+ IRC_COLOR_RESET);
return WEECHAT_RC_OK;
}
@@ -3101,7 +3101,7 @@ IRC_PROTOCOL_CALLBACK(344)
weechat_prefix ("network"),
IRC_COLOR_CHAT_CHANNEL,
argv[3],
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
IRC_COLOR_CHAT_HOST,
(argv_eol[4][0] == ':') ? argv_eol[4] + 1 : argv_eol[4]);
@@ -3129,7 +3129,7 @@ IRC_PROTOCOL_CALLBACK(345)
weechat_prefix ("network"),
IRC_COLOR_CHAT_CHANNEL,
argv[3],
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
(argv_eol[4][0] == ':') ? argv_eol[4] + 1 : argv_eol[4]);
return WEECHAT_RC_OK;
@@ -3172,14 +3172,14 @@ IRC_PROTOCOL_CALLBACK(346)
IRC_COLOR_CHAT_DELIMITERS,
IRC_COLOR_CHAT_HOST,
argv[4],
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
IRC_COLOR_CHAT_NICK,
irc_message_get_nick_from_host (argv[5]),
IRC_COLOR_CHAT_DELIMITERS,
IRC_COLOR_CHAT_HOST,
irc_message_get_address_from_host (argv[5]),
IRC_COLOR_CHAT_DELIMITERS,
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
weechat_util_get_time_string (&datetime));
}
else
@@ -3197,7 +3197,7 @@ IRC_PROTOCOL_CALLBACK(346)
IRC_COLOR_CHAT_DELIMITERS,
IRC_COLOR_CHAT_HOST,
argv[4],
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
IRC_COLOR_CHAT_NICK,
irc_message_get_nick_from_host (argv[5]),
IRC_COLOR_CHAT_DELIMITERS,
@@ -3242,7 +3242,7 @@ IRC_PROTOCOL_CALLBACK(347)
IRC_COLOR_CHAT_CHANNEL,
argv[3],
IRC_COLOR_CHAT_DELIMITERS,
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
(pos_args) ? " " : "",
(pos_args) ? pos_args : "");
@@ -3285,17 +3285,17 @@ IRC_PROTOCOL_CALLBACK(348)
IRC_COLOR_CHAT_CHANNEL,
argv[3],
IRC_COLOR_CHAT_DELIMITERS,
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
IRC_COLOR_CHAT_HOST,
argv[4],
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
IRC_COLOR_CHAT_NICK,
irc_message_get_nick_from_host (argv[5]),
IRC_COLOR_CHAT_DELIMITERS,
IRC_COLOR_CHAT_HOST,
irc_message_get_address_from_host (argv[5]),
IRC_COLOR_CHAT_DELIMITERS,
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
weechat_util_get_time_string (&datetime));
}
else
@@ -3310,7 +3310,7 @@ IRC_PROTOCOL_CALLBACK(348)
IRC_COLOR_CHAT_CHANNEL,
argv[3],
IRC_COLOR_CHAT_DELIMITERS,
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
IRC_COLOR_CHAT_HOST,
argv[4]);
}
@@ -3351,7 +3351,7 @@ IRC_PROTOCOL_CALLBACK(349)
IRC_COLOR_CHAT_CHANNEL,
argv[3],
IRC_COLOR_CHAT_DELIMITERS,
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
(pos_args) ? " " : "",
(pos_args) ? pos_args : "");
@@ -3476,7 +3476,7 @@ IRC_PROTOCOL_CALLBACK(352)
argv[4],
argv[5],
IRC_COLOR_CHAT_DELIMITERS,
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
(pos_attr) ? pos_attr : "",
(pos_attr) ? " " : "",
(pos_hopcount) ? pos_hopcount : "",
@@ -3575,9 +3575,9 @@ IRC_PROTOCOL_CALLBACK(353)
weechat_prefix ("network"),
IRC_COLOR_CHAT_CHANNEL,
pos_channel,
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
IRC_COLOR_CHAT_DELIMITERS,
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
(argv_eol[args][0] == ':') ?
argv_eol[args] + 1 : argv_eol[args],
IRC_COLOR_CHAT_DELIMITERS);
@@ -3673,7 +3673,7 @@ IRC_PROTOCOL_CALLBACK(366)
strcat (string, irc_nick_find_color (nickname));
}
else
- strcat (string, IRC_COLOR_CHAT);
+ strcat (string, IRC_COLOR_RESET);
strcat (string, nickname);
i++;
}
@@ -3686,7 +3686,7 @@ IRC_PROTOCOL_CALLBACK(366)
weechat_prefix ("network"),
IRC_COLOR_CHAT_CHANNEL,
ptr_channel->name,
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
IRC_COLOR_CHAT_DELIMITERS,
string,
IRC_COLOR_CHAT_DELIMITERS);
@@ -3708,27 +3708,27 @@ IRC_PROTOCOL_CALLBACK(366)
weechat_prefix ("network"),
IRC_COLOR_CHAT_CHANNEL,
ptr_channel->name,
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
IRC_COLOR_CHAT_CHANNEL,
num_nicks,
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
NG_("nick", "nicks", num_nicks),
IRC_COLOR_CHAT_DELIMITERS,
IRC_COLOR_CHAT_CHANNEL,
num_op,
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
NG_("op", "ops", num_op),
IRC_COLOR_CHAT_CHANNEL,
num_halfop,
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
NG_("halfop", "halfops", num_halfop),
IRC_COLOR_CHAT_CHANNEL,
num_voice,
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
NG_("voice", "voices", num_voice),
IRC_COLOR_CHAT_CHANNEL,
num_normal,
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
NG_("normal", "normals", num_normal),
IRC_COLOR_CHAT_DELIMITERS);
@@ -3745,7 +3745,7 @@ IRC_PROTOCOL_CALLBACK(366)
weechat_prefix ("network"),
IRC_COLOR_CHAT_CHANNEL,
argv[3],
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
(argv[4][0] == ':') ? argv_eol[4] + 1 : argv_eol[4]);
}
@@ -3789,14 +3789,14 @@ IRC_PROTOCOL_CALLBACK(367)
IRC_COLOR_CHAT_DELIMITERS,
IRC_COLOR_CHAT_HOST,
argv[4],
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
IRC_COLOR_CHAT_NICK,
irc_message_get_nick_from_host (argv[5]),
IRC_COLOR_CHAT_DELIMITERS,
IRC_COLOR_CHAT_HOST,
irc_message_get_address_from_host (argv[5]),
IRC_COLOR_CHAT_DELIMITERS,
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
weechat_util_get_time_string (&datetime));
}
else
@@ -3814,7 +3814,7 @@ IRC_PROTOCOL_CALLBACK(367)
IRC_COLOR_CHAT_DELIMITERS,
IRC_COLOR_CHAT_HOST,
argv[4],
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
IRC_COLOR_CHAT_NICK,
irc_message_get_nick_from_host (argv[5]),
IRC_COLOR_CHAT_DELIMITERS,
@@ -3859,7 +3859,7 @@ IRC_PROTOCOL_CALLBACK(368)
IRC_COLOR_CHAT_CHANNEL,
argv[3],
IRC_COLOR_CHAT_DELIMITERS,
- IRC_COLOR_CHAT,
+ IRC_COLOR_RESET,
(pos_args) ? " " : "",
(pos_args) ? pos_args : "");
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 00:57:08 +0000