Merged silc_1_0_branch to trunk.

[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 f46e6ea2862d7b8e4edbdfc35be8b452de825b22..2c4c064bfe21350e2236c07d8237a91a465368c7 100644 (file)
--- a/apps/irssi/src/fe-common/silc/module-formats.h
+++ b/apps/irssi/src/fe-common/silc/module-formats.h
@@ -30,10 +30,6 @@ enum {
   SILCTXT_CHANNEL_TOPIC_NOT_SET,
   SILCTXT_CHANNEL_CMODE,
   SILCTXT_CHANNEL_CUMODE,
-  SILCTXT_CHANNEL_ACTION,
-  SILCTXT_CHANNEL_NOTICE,
-  SILCTXT_CHANNEL_OWNACTION,
-  SILCTXT_CHANNEL_OWNNOTICE,
   SILCTXT_CHANNEL_INVITEBAN_LIST,
   SILCTXT_CHANNEL_INVITEBAN_STRING,
   SILCTXT_CHANNEL_INVITEBAN_PUBKEY,
@@ -79,6 +75,37 @@ enum {
   SILCTXT_CHANNEL_PK_LIST,
   SILCTXT_CHANNEL_PK_LIST_ENTRY,
   SILCTXT_CHANNEL_PK_NO_LIST,
+  SILCTXT_OWN_ACTION,
+  SILCTXT_OWN_ACTION_SIGNED,
+  SILCTXT_OWN_ACTION_TARGET,
+  SILCTXT_OWN_ACTION_TARGET_SIGNED,
+  SILCTXT_ACTION_PUBLIC,
+  SILCTXT_ACTION_PUBLIC_SIGNED,
+  SILCTXT_ACTION_PUBLIC_UNKNOWN,
+  SILCTXT_ACTION_PUBLIC_FAILED,
+  SILCTXT_ACTION_PUBLIC_CHANNEL,
+  SILCTXT_ACTION_PUBLIC_CHANNEL_SIGNED,
+  SILCTXT_ACTION_PUBLIC_CHANNEL_UNKNOWN,
+  SILCTXT_ACTION_PUBLIC_CHANNEL_FAILED,
+  SILCTXT_ACTION_PRIVATE,
+  SILCTXT_ACTION_PRIVATE_SIGNED,
+  SILCTXT_ACTION_PRIVATE_UNKNOWN,
+  SILCTXT_ACTION_PRIVATE_FAILED,
+  SILCTXT_ACTION_PRIVATE_QUERY,
+  SILCTXT_ACTION_PRIVATE_QUERY_SIGNED,
+  SILCTXT_ACTION_PRIVATE_QUERY_UNKNOWN,
+  SILCTXT_ACTION_PRIVATE_QUERY_FAILED,
+  SILCTXT_OWN_NOTICE,
+  SILCTXT_OWN_NOTICE_SIGNED,
+  SILCTXT_NOTICE_PUBLIC,
+  SILCTXT_NOTICE_PUBLIC_SIGNED,
+  SILCTXT_NOTICE_PUBLIC_UNKNOWN,
+  SILCTXT_NOTICE_PUBLIC_FAILED,
+  SILCTXT_NOTICE_PRIVATE,
+  SILCTXT_NOTICE_PRIVATE_SIGNED,
+  SILCTXT_NOTICE_PRIVATE_UNKNOWN,
+  SILCTXT_NOTICE_PRIVATE_FAILED,
+
 
   SILCTXT_FILL_2,
 
@@ -157,6 +184,8 @@ enum {
   SILCTXT_WATCH_NICK_CHANGE,
   SILCTXT_MESSAGE_DATA,
   SILCTXT_STATS,
+  SILCTXT_REATTACH,
+  SILCTXT_REATTACH_FAILED,
 
   SILCTXT_FILL_5,
 
@@ -205,6 +234,32 @@ enum {
   SILCTXT_ATTR_EXTENSION,
   SILCTXT_ATTR_SAVE,
   SILCTXT_ATTR_SAVED,
+
+  SILCTXT_FILL_7,
+  
+  SILCTXT_LISTKEY_PUB_FILE,
+  SILCTXT_LISTKEY_PUB_ALG,
+  SILCTXT_LISTKEY_PUB_BITS,
+  SILCTXT_LISTKEY_PUB_RN,
+  SILCTXT_LISTKEY_PUB_UN,
+  SILCTXT_LISTKEY_PUB_HN,
+  SILCTXT_LISTKEY_PUB_EMAIL,
+  SILCTXT_LISTKEY_PUB_ORG,
+  SILCTXT_LISTKEY_PUB_C,
+  SILCTXT_LISTKEY_PUB_FINGER,
+  SILCTXT_LISTKEY_PUB_BABL,
+  SILCTXT_LISTKEY_LOADPUB,
+  SILCTXT_LISTKEY_LIST,
+
+  SILCTXT_FILL_8,
+
+  SILCTXT_SILCNET_ADDED,
+  SILCTXT_SILCNET_REMOVED,
+  SILCTXT_SILCNET_NOT_FOUND,
+  SILCTXT_SILCNET_HEADER,
+  SILCTXT_SILCNET_LINE,
+  SILCTXT_SILCNET_FOOTER
+
 };
 
 extern FORMAT_REC fecommon_silc_formats[];