updates.

[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 d51c943aa665fe84410bedd4e9fc4bbcda6a89b8..6c9c7f2a2193dfe8e762a4e176215e4807841339 100644 (file)
--- a/apps/irssi/src/silc/core/silc-core.c
+++ b/apps/irssi/src/silc/core/silc-core.c
@@ -50,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;
-SilcUInt32 sims_count = 0;
-#endif
+
+void silc_expandos_init(void);
+void silc_expandos_deinit(void);
 
 static int my_silc_scheduler(void)
 {
@@ -102,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 */
@@ -112,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");
   }
 
@@ -131,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);
   }
@@ -242,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(arg);
+    silc_client_show_key((char *)arg);
     exit(0);
   }
 
@@ -422,6 +415,7 @@ 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);
 
@@ -439,6 +433,7 @@ void silc_core_deinit(void)
     silc_server_deinit();
     silc_channels_deinit();
     silc_queries_deinit();
+    silc_expandos_deinit();
     
     chat_protocol_unregister("SILC");