Changed the version string variables to #defines.

[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 9039a5dc5faa6f5b45eb0621c66632cdcf820306..aec63667c6766ae70332e0fb9133638054f22d01 100644 (file)
--- a/apps/irssi/src/silc/core/silc-core.c
+++ b/apps/irssi/src/silc/core/silc-core.c
@@ -29,7 +29,6 @@
 #include "silc-channels.h"
 #include "silc-queries.h"
 #include "silc-nicklist.h"
-#include "silcversion.h"
 
 #include "signals.h"
 #include "levels.h"
@@ -264,7 +263,7 @@ void silc_opt_callback(poptContext con,
     silc_pkcs_register_default();
     silc_hash_register_default();
     silc_hmac_register_default();
-    silc_client_show_key((char *)arg);
+    silc_show_public_key((char *)arg);
     exit(0);
   }
 
@@ -310,8 +309,8 @@ void silc_opt_callback(poptContext con,
     silc_pkcs_register_default();
     silc_hash_register_default();
     silc_hmac_register_default();
-    silc_client_create_key_pair(opt_pkcs, opt_bits, 
-                               NULL, NULL, NULL, NULL, NULL);
+    silc_create_key_pair(opt_pkcs, opt_bits, NULL, NULL, NULL,
+                        NULL, NULL, NULL, TRUE);
     exit(0);
   }
 }
@@ -362,6 +361,7 @@ void silc_core_init(void)
   settings_add_int("server", "key_exchange_timeout_secs", 120);
   settings_add_int("server", "key_exchange_rekey_secs", 3600);
   settings_add_int("server", "connauth_request_secs", 2);
+  settings_add_int("server", "heartbeat", 300);
 
   /* Requested Attributes settings */
   settings_add_bool("silc", "attr_allow", TRUE);
@@ -444,9 +444,10 @@ void silc_core_init(void)
   rec->create_channel_setup = create_channel_setup;
   rec->create_server_connect = create_server_connect;
   rec->destroy_server_connect = destroy_server_connect;
-  rec->server_connect = (SERVER_REC *(*) (SERVER_CONNECT_REC *))
-    silc_server_connect; 
-  rec->channel_create = (CHANNEL_REC *(*) (SERVER_REC *, const char *, int))
+  rec->server_init_connect = silc_server_init_connect; 
+  rec->server_connect = silc_server_connect;
+  rec->channel_create = (CHANNEL_REC *(*) (SERVER_REC *, const char *, 
+                                          const char *, int))
     silc_channel_create;
   rec->query_create = (QUERY_REC *(*) (const char *, const char *, int))
     silc_query_create;