projects
/
crypto.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merges from Irssi CVS.
[crypto.git]
/
apps
/
irssi
/
src
/
fe-common
/
core
/
fe-messages.c
diff --git
a/apps/irssi/src/fe-common/core/fe-messages.c
b/apps/irssi/src/fe-common/core/fe-messages.c
index 4b4e4db4f758776a561bdc1cd9324b8354f604b8..481301039f2bf4f0203826691831394666fb6ee6 100644
(file)
--- a/
apps/irssi/src/fe-common/core/fe-messages.c
+++ b/
apps/irssi/src/fe-common/core/fe-messages.c
@@
-396,7
+396,7
@@
static void sig_message_kick(SERVER_REC *server, const char *channel,
const char *address, const char *reason)
{
printformat(server, channel, MSGLEVEL_KICKS,
const char *address, const char *reason)
{
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,
ownnick ? TXT_YOUR_NICK_CHANGED : TXT_NICK_CHANGED,
printformat(server, channel, level,
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,
@@
-449,7
+449,8
@@
static void print_nick_change(SERVER_REC *server, const char *newnick,
if (!msgprint && ownnick) {
printformat(server, NULL, MSGLEVEL_NICKS,
if (!msgprint && ownnick) {
printformat(server, NULL, MSGLEVEL_NICKS,
- TXT_YOUR_NICK_CHANGED, oldnick, newnick, "");
+ TXT_YOUR_NICK_CHANGED, oldnick, newnick, "",
+ address);
}
}
}
}
@@
-466,7
+467,8
@@
static void sig_message_own_nick(SERVER_REC *server, const char *newnick,
print_nick_change(server, newnick, oldnick, address, TRUE);
else {
printformat(server, NULL, MSGLEVEL_NICKS,
print_nick_change(server, newnick, oldnick, address, TRUE);
else {
printformat(server, NULL, MSGLEVEL_NICKS,
- TXT_YOUR_NICK_CHANGED, oldnick, newnick, "");
+ TXT_YOUR_NICK_CHANGED, oldnick, newnick, "",
+ address);
}
}
}
}
@@
-477,7
+479,7
@@
static void sig_message_invite(SERVER_REC *server, const char *channel,
str = show_lowascii(channel);
printformat(server, NULL, MSGLEVEL_INVITES,
str = show_lowascii(channel);
printformat(server, NULL, MSGLEVEL_INVITES,
- TXT_INVITE, nick, str);
+ TXT_INVITE, nick, str
, address
);
g_free(str);
}
g_free(str);
}
@@
-487,7
+489,7
@@
static void sig_message_topic(SERVER_REC *server, const char *channel,
{
printformat(server, channel, MSGLEVEL_TOPICS,
*topic != '\0' ? TXT_NEW_TOPIC : TXT_TOPIC_UNSET,
{
printformat(server, channel, MSGLEVEL_TOPICS,
*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,