Merges from Irssi CVS.

[runtime.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 0205ca40d2a5e3a5eb96bf744b33671880580ae0..9578ce9b5518253764e9dfd242bfac94de055ea9 100644 (file)
--- a/apps/irssi/src/silc/core/silc-core.c
+++ b/apps/irssi/src/silc/core/silc-core.c
@@ -29,8 +29,7 @@
 #include "silc-channels.h"
 #include "silc-queries.h"
 #include "silc-nicklist.h"
-#include "version_internal.h"
-#include "version.h"
+#include "silcversion.h"
 
 #include "signals.h"
 #include "levels.h"
@@ -51,11 +50,9 @@ SilcClient silc_client = NULL;
 extern SilcClientOperations ops;
 extern bool silc_debug;
 extern bool silc_debug_hexdump;
-#ifdef SILC_SIM
-/* SIM (SILC Module) table */
-SilcSimContext **sims = NULL;
-uint32 sims_count = 0;
-#endif
+
+void silc_expandos_init(void);
+void silc_expandos_deinit(void);
 
 static int my_silc_scheduler(void)
 {
@@ -103,7 +100,7 @@ static void silc_init_userinfo(void)
     if (!str)
       str = g_getenv("IRCNAME");
     settings_set_str("real_name",
-                    str != NULL ? str : g_get_real_name());
+                    str != NULL ? str : silc_get_real_name());
   }
  
   /* username */
@@ -113,8 +110,8 @@ static void silc_init_userinfo(void)
     if (!str)
       str = g_getenv("IRCUSER");
     settings_set_str("user_name",
-                    str != NULL ? str : g_get_user_name());
-    
+                    str != NULL ? str : silc_get_username());
+
     user_name = settings_get_str("user_name");
   }
 
@@ -132,12 +129,7 @@ static void silc_init_userinfo(void)
   /* alternate nick */
   set = settings_get_str("alternate_nick");
   if (set == NULL || *set == '\0') {
-    if (strlen(nick) < 9)
-      str = g_strconcat(nick, "_", NULL);
-    else { 
-      str = g_strdup(nick);
-      str[strlen(str)-1] = '_';
-    }
+    str = g_strconcat(nick, "_", NULL);
     settings_set_str("alternate_nick", str);
     g_free(str);
   }
@@ -174,7 +166,7 @@ static void silc_register_cipher(SilcClient client, const char *cipher)
   if (cipher) {
     for (i = 0; silc_default_ciphers[i].name; i++)
       if (!strcmp(silc_default_ciphers[i].name, cipher)) {
-       silc_cipher_register(&silc_default_ciphers[i]);
+       silc_cipher_register(&(silc_default_ciphers[i]));
        break;
       }
     
@@ -195,7 +187,7 @@ static void silc_register_hash(SilcClient client, const char *hash)
   if (hash) {
     for (i = 0; silc_default_hash[i].name; i++)
       if (!strcmp(silc_default_hash[i].name, hash)) {
-       silc_hash_register(&silc_default_hash[i]);
+       silc_hash_register(&(silc_default_hash[i]));
        break;
       }
     
@@ -216,7 +208,7 @@ static void silc_register_hmac(SilcClient client, const char *hmac)
   if (hmac) {
     for (i = 0; silc_default_hmacs[i].name; i++)
       if (!strcmp(silc_default_hmacs[i].name, hmac)) {
-       silc_hmac_register(&silc_default_hmacs[i]);
+       silc_hmac_register(&(silc_default_hmacs[i]));
        break;
       }
     
@@ -243,7 +235,7 @@ void silc_opt_callback(poptContext con,
     silc_pkcs_register_default();
     silc_hash_register_default();
     silc_hmac_register_default();
-    silc_client_show_key(opt->arg);
+    silc_client_show_key((char *)arg);
     exit(0);
   }
 
@@ -423,8 +415,11 @@ void silc_core_init(void)
   silc_server_init();
   silc_channels_init();
   silc_queries_init();
+  silc_expandos_init();
 
   idletag = g_timeout_add(5, (GSourceFunc) my_silc_scheduler, NULL);
+
+  module_register("silc", "core");
 }
 
 /* Deinit SILC. Called from src/fe-text/silc.c */
@@ -434,10 +429,13 @@ void silc_core_deinit(void)
   if (idletag != -1) {
     signal_emit("chat protocol deinit", 1,
                chat_protocol_find("SILC"));
+    signal_remove("irssi init read settings", 
+                 (SIGNAL_FUNC) sig_init_read_settings);
     
     silc_server_deinit();
     silc_channels_deinit();
     silc_queries_deinit();
+    silc_expandos_deinit();
     
     chat_protocol_unregister("SILC");