Merged silc_1_0_branch to trunk.

[silc.git] / apps / irssi / src / silc / core / silc-core.c

diff --git a/apps/irssi/src/silc/core/silc-core.c b/apps/irssi/src/silc/core/silc-core.c
index caf8b508b750f39853399359bc9cb22299cd57d6..421fe6fc5874bd4ef432666f32c78bf229c94d53 100644 (file)
--- a/apps/irssi/src/silc/core/silc-core.c
+++ b/apps/irssi/src/silc/core/silc-core.c
@@ -52,6 +52,9 @@ extern bool silc_debug_hexdump;
 void silc_expandos_init(void);
 void silc_expandos_deinit(void);
 
+void silc_lag_init(void);
+void silc_lag_deinit(void);
+
 static int my_silc_scheduler(void)
 {
   silc_client_run_one(silc_client);
@@ -360,8 +363,10 @@ void silc_core_init(void)
       "List supported HMACs", NULL },
     { "list-pkcs", 0, POPT_ARG_NONE, NULL, 0,
       "List supported PKCSs", NULL },
+#ifdef SILC_DEBUG
     { "debug", 'd', POPT_ARG_STRING, NULL, 0,
       "Enable debugging", "STRING" },
+#endif /* SILC_DEBUG */
     { "create-key-pair", 'C', POPT_ARG_NONE, NULL, 0,
       "Create new public key pair", NULL },
     { "pkcs", 0, POPT_ARG_STRING, &opt_pkcs, 0,
@@ -395,6 +400,7 @@ void silc_core_init(void)
   settings_add_int("server", "key_exchange_rekey_secs", 3600);
   settings_add_int("server", "connauth_request_secs", 2);
   settings_add_int("server", "heartbeat", 300);
+  settings_add_bool("server", "ignore_message_signatures", FALSE);
 
   /* Requested Attributes settings */
   settings_add_bool("silc", "attr_allow", TRUE);
@@ -475,6 +481,7 @@ void silc_core_init(void)
   silc_channels_init();
   silc_queries_init();
   silc_expandos_init();
+  silc_lag_init();
 
   idletag = g_timeout_add(5, (GSourceFunc) my_silc_scheduler, NULL);
 
@@ -495,6 +502,7 @@ void silc_core_deinit(void)
     silc_channels_deinit();
     silc_queries_deinit();
     silc_expandos_deinit();
+    silc_lag_deinit();
     
     chat_protocol_unregister("SILC");