X-Git-Url: http://git.silcnet.org/gitweb/?a=blobdiff_plain;f=apps%2Firssi%2Fsrc%2Ffe-common%2Fsilc%2Fmodule-formats.c;h=d542ccc63237edaa0802709cb6edb14f30f8ba3e;hb=017dec75a98209fbef49eb496c2269b0c49e736d;hp=58d1462b0bc6e6f58527be93e4c3316d091b37bf;hpb=d1707838d432e3d95b2a0250bb2ec30fd2ed9ad8;p=silc.git

diff --git a/apps/irssi/src/fe-common/silc/module-formats.c b/apps/irssi/src/fe-common/silc/module-formats.c
index 58d1462b..d542ccc6 100644
--- a/apps/irssi/src/fe-common/silc/module-formats.c
+++ b/apps/irssi/src/fe-common/silc/module-formats.c
@@ -43,11 +43,16 @@ FORMAT_REC fecommon_silc_formats[] = {
 	{ "ban_list", "channel {channel $0} ban list: $1", 2, { 0, 0 } },
 	{ "no_ban_list", "channel {channel $0} ban list not set", 1, { 0 } },
 	{ "inviting", "Inviting {nick $0} to channel {channel $1}", 2, { 0, 0 } },
+	{ "kicked_you", "You have been kicked off channel {channel $0} ($1)", 2, { 0, 0 } },
+	{ "kicked", "{nick $0} has been kicked off channel {channel $1} ($2)", 3, { 0, 0, 0 } },
+	{ "killed_you", "You have been killed from the SILC Network", 0 },
+	{ "killed", "{nick $0} has been killed from the SILC Network ($1)", 2, { 0, 0 } },
 
 	/* WHOIS, WHOWAS and USERS (alias WHO) messages */
 	{ NULL, "Who Queries", 0 },
 
-	{ "whois", "{nick $0} {nickhost $1}%: realname : $2", 3, { 0, 0, 0 } },
+	{ "whois", "{nick $0} {nickhost $1@$2}%: nickname : $3 ($4)", 5, { 0, 0, 0, 0, 0 } },
+	{ "whois_realname", " realname : $0", 1, { 0 } },
 	{ "whois_channels", " channels : $0", 1, { 0 } },
 	{ "whois_modes", " modes    : $0", 1, { 0 } },
 	{ "whois_idle", " idle     : $0", 1, { 0 } },
@@ -84,6 +89,7 @@ FORMAT_REC fecommon_silc_formats[] = {
 	{ "pubkey_no_match", "{hilight $0} key does not match with your local copy", 1, { 0 } },
 	{ "pubkey_maybe_expired", "It is possible that the key has expired or changed", 0 },
 	{ "pubkey_mitm_attach", "It is also possible that someone is performing man-in-the-middle attack", 0 },
+	{ "getkey_notkey", "Server did not return any public key", 0 },
 
 	/* Misc messages */
 	{ NULL, "Misc", 0 },
@@ -102,6 +108,7 @@ FORMAT_REC fecommon_silc_formats[] = {
 	{ "ke_unknown_hash_function", "Server does not support one of your proposed hash function", 0 },
 	{ "ke_unknown_hmac", "Server does not support one of your proposed HMAC", 0 },
 	{ "ke_incorrect_signature", "Incorrect signature", 0 },
+	{ "ke_invalid_cookie", "Invalid cookie", 0 },
 	{ "auth_failed", "Authentication failed", 0 },
 	{ "set_away", "You have meen marked as being away (away message: {hilight $0})", 1, { 0 } },
 	{ "unset_away", "You are no longer marked as being away", 0 },