projects
/
silc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'origin/silc.1.1.branch'
[silc.git]
/
apps
/
irssi
/
src
/
fe-common
/
silc
/
module-formats.h
diff --git
a/apps/irssi/src/fe-common/silc/module-formats.h
b/apps/irssi/src/fe-common/silc/module-formats.h
index 8f174be1e7a0a6fdec6f64a9aa6369b2e1fdaa97..408715be917b7b61ed48ecb9b6d507f462239185 100644
(file)
--- a/
apps/irssi/src/fe-common/silc/module-formats.h
+++ b/
apps/irssi/src/fe-common/silc/module-formats.h
@@
-26,6
+26,7
@@
enum {
SILCTXT_CHANNEL_FOUNDER_YOU,
SILCTXT_CHANNEL_FOUNDER,
SILCTXT_CHANNEL_FOUNDER_YOU,
SILCTXT_CHANNEL_FOUNDER,
+ SILCTXT_CHANNEL_FOUNDER_CHANGED,
SILCTXT_CHANNEL_TOPIC,
SILCTXT_CHANNEL_TOPIC_NOT_SET,
SILCTXT_CHANNEL_CMODE,
SILCTXT_CHANNEL_TOPIC,
SILCTXT_CHANNEL_TOPIC_NOT_SET,
SILCTXT_CHANNEL_CMODE,
@@
-142,6
+143,7
@@
enum {
SILCTXT_KEY_AGREEMENT_ALREADY_STARTED,
SILCTXT_KEY_AGREEMENT_SELF_DENIED,
SILCTXT_PUBKEY_RECEIVED,
SILCTXT_KEY_AGREEMENT_ALREADY_STARTED,
SILCTXT_KEY_AGREEMENT_SELF_DENIED,
SILCTXT_PUBKEY_RECEIVED,
+ SILCTXT_PUBKEY_RECEIVED_CLIENT,
SILCTXT_PUBKEY_FINGERPRINT,
SILCTXT_PUBKEY_BABBLEPRINT,
SILCTXT_PUBKEY_UNSUPPORTED,
SILCTXT_PUBKEY_FINGERPRINT,
SILCTXT_PUBKEY_BABBLEPRINT,
SILCTXT_PUBKEY_UNSUPPORTED,
@@
-155,6
+157,7
@@
enum {
SILCTXT_PUBKEY_MITM_ATTACK,
SILCTXT_PUBKEY_NOKEY,
SILCTXT_PUBKEY_VERIFIED,
SILCTXT_PUBKEY_MITM_ATTACK,
SILCTXT_PUBKEY_NOKEY,
SILCTXT_PUBKEY_VERIFIED,
+ SILCTXT_PUBKEY_VERIFIED_CLIENT,
SILCTXT_PUBKEY_NOTVERIFIED,
SILCTXT_FILL_4,
SILCTXT_PUBKEY_NOTVERIFIED,
SILCTXT_FILL_4,