mirror of
https://github.com/irssi/irssi.git
synced 2024-10-27 05:20:20 -04:00
address parameter was missing from /FORMAT invite, nick_changed, kick and
topic. git-svn-id: http://svn.irssi.org/repos/irssi/trunk@2669 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
parent
d5c15a8ee3
commit
5ff21626b2
@ -396,7 +396,7 @@ static void sig_message_kick(SERVER_REC *server, const char *channel,
|
|||||||
const char *address, const char *reason)
|
const char *address, const char *reason)
|
||||||
{
|
{
|
||||||
printformat(server, channel, MSGLEVEL_KICKS,
|
printformat(server, channel, MSGLEVEL_KICKS,
|
||||||
TXT_KICK, nick, channel, kicker, reason);
|
TXT_KICK, nick, channel, kicker, reason, address);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void print_nick_change_channel(SERVER_REC *server, const char *channel,
|
static void print_nick_change_channel(SERVER_REC *server, const char *channel,
|
||||||
@ -415,7 +415,7 @@ static void print_nick_change_channel(SERVER_REC *server, const char *channel,
|
|||||||
|
|
||||||
printformat(server, channel, level,
|
printformat(server, channel, level,
|
||||||
ownnick ? TXT_YOUR_NICK_CHANGED : TXT_NICK_CHANGED,
|
ownnick ? TXT_YOUR_NICK_CHANGED : TXT_NICK_CHANGED,
|
||||||
oldnick, newnick, channel);
|
oldnick, newnick, channel, address);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void print_nick_change(SERVER_REC *server, const char *newnick,
|
static void print_nick_change(SERVER_REC *server, const char *newnick,
|
||||||
@ -477,7 +477,7 @@ static void sig_message_invite(SERVER_REC *server, const char *channel,
|
|||||||
|
|
||||||
str = show_lowascii(channel);
|
str = show_lowascii(channel);
|
||||||
printformat(server, NULL, MSGLEVEL_INVITES,
|
printformat(server, NULL, MSGLEVEL_INVITES,
|
||||||
TXT_INVITE, nick, str);
|
TXT_INVITE, nick, str, address);
|
||||||
g_free(str);
|
g_free(str);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -487,7 +487,7 @@ static void sig_message_topic(SERVER_REC *server, const char *channel,
|
|||||||
{
|
{
|
||||||
printformat(server, channel, MSGLEVEL_TOPICS,
|
printformat(server, channel, MSGLEVEL_TOPICS,
|
||||||
*topic != '\0' ? TXT_NEW_TOPIC : TXT_TOPIC_UNSET,
|
*topic != '\0' ? TXT_NEW_TOPIC : TXT_TOPIC_UNSET,
|
||||||
nick, channel, topic);
|
nick, channel, topic, address);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int printnick_exists(NICK_REC *first, NICK_REC *ignore,
|
static int printnick_exists(NICK_REC *first, NICK_REC *ignore,
|
||||||
|
@ -95,15 +95,15 @@ FORMAT_REC fecommon_core_formats[] = {
|
|||||||
|
|
||||||
{ "join", "{channick_hilight $0} {chanhost_hilight $1} has joined {channel $2}", 3, { 0, 0, 0 } },
|
{ "join", "{channick_hilight $0} {chanhost_hilight $1} has joined {channel $2}", 3, { 0, 0, 0 } },
|
||||||
{ "part", "{channick $0} {chanhost $1} has left {channel $2} {reason $3}", 4, { 0, 0, 0, 0 } },
|
{ "part", "{channick $0} {chanhost $1} has left {channel $2} {reason $3}", 4, { 0, 0, 0, 0 } },
|
||||||
{ "kick", "{channick $0} was kicked from {channel $1} by {nick $2} {reason $3}", 4, { 0, 0, 0, 0 } },
|
{ "kick", "{channick $0} was kicked from {channel $1} by {nick $2} {reason $3}", 5, { 0, 0, 0, 0, 0 } },
|
||||||
{ "quit", "{channick $0} {chanhost $1} has quit {reason $2}", 4, { 0, 0, 0, 0 } },
|
{ "quit", "{channick $0} {chanhost $1} has quit {reason $2}", 4, { 0, 0, 0, 0 } },
|
||||||
{ "quit_once", "{channel $3} {channick $0} {chanhost $1} has quit {reason $2}", 4, { 0, 0, 0, 0 } },
|
{ "quit_once", "{channel $3} {channick $0} {chanhost $1} has quit {reason $2}", 4, { 0, 0, 0, 0 } },
|
||||||
{ "invite", "{nick $0} invites you to {channel $1}", 2, { 0, 0 } },
|
{ "invite", "{nick $0} invites you to {channel $1}", 3, { 0, 0, 0 } },
|
||||||
{ "not_invited", "You have not been invited to a channel!", 0 },
|
{ "not_invited", "You have not been invited to a channel!", 0 },
|
||||||
{ "new_topic", "{nick $0} changed the topic of {channel $1} to: $2", 3, { 0, 0, 0 } },
|
{ "new_topic", "{nick $0} changed the topic of {channel $1} to: $2", 4, { 0, 0, 0, 0 } },
|
||||||
{ "topic_unset", "Topic unset by {nick $0} on {channel $1}", 2, { 0, 0 } },
|
{ "topic_unset", "Topic unset by {nick $0} on {channel $1}", 4, { 0, 0, 0, 0 } },
|
||||||
{ "your_nick_changed", "You're now known as {nick $1}", 3, { 0, 0, 0 } },
|
{ "your_nick_changed", "You're now known as {nick $1}", 3, { 0, 0, 0 } },
|
||||||
{ "nick_changed", "{channick $0} is now known as {channick_hilight $1}", 3, { 0, 0, 0 } },
|
{ "nick_changed", "{channick $0} is now known as {channick_hilight $1}", 4, { 0, 0, 0, 0 } },
|
||||||
{ "talking_in", "You are now talking in {channel $0}", 1, { 0 } },
|
{ "talking_in", "You are now talking in {channel $0}", 1, { 0 } },
|
||||||
{ "not_in_channels", "You are not on any channels", 0 },
|
{ "not_in_channels", "You are not on any channels", 0 },
|
||||||
{ "current_channel", "Current channel {channel $0}", 1, { 0 } },
|
{ "current_channel", "Current channel {channel $0}", 1, { 0 } },
|
||||||
|
Loading…
Reference in New Issue
Block a user