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 430748b28d00cc89dff747c37e973bc729a52b2c..5566ace2212d936df6f1872e65dfcb651a2ad31a 100644 (file)
--- a/apps/irssi/src/silc/core/silc-core.c
+++ b/apps/irssi/src/silc/core/silc-core.c
@@ -216,14 +216,6 @@ static bool silc_log_stderr(SilcLogType type, char *message, void *context)
   return TRUE;
 }
 
-static void silc_nickname_format_parse(const char *nickname,
-                                      char **ret_nickname)
-{
-  char nick[128 + 1];
-  silc_parse_userfqdn(nickname, nick, sizeof(nick), NULL, 0);
-  *ret_nickname = strdup(nick);
-}
-
 static void silc_register_cipher(SilcClient client, const char *cipher)
 {
   int i;
@@ -372,28 +364,51 @@ void silc_opt_callback(poptContext con,
   }
 }
 
+/* Called to indicate the client library has stopped. */
+
+static void
+silc_stopped(SilcClient client, void *context)
+{
+  SILC_LOG_DEBUG(("Client library has stopped"));
+  if (idletag != -1)
+    g_source_remove(idletag);
+}
+
+static void sig_gui_quit(SILC_SERVER_REC *server, const char *msg)
+{
+  silc_client_stop(silc_client, silc_stopped, NULL);
+}
+
+/* Called to indicate the client library is running. */
+
+static void
+silc_running(SilcClient client, void *context)
+{
+  SILC_LOG_DEBUG(("Client library is running"));
+}
+
 static void sig_init_finished(void)
 {
   /* Check ~/.silc directory and public and private keys */
   if (!silc_client_check_silc_dir()) {
     sleep(1);
-    signal_emit("gui exit", 0);
+    exit(1);
     return;
   }
 
   /* Load public and private key */
   if (!silc_client_load_keys(silc_client)) {
     sleep(1);
-    signal_emit("gui exit", 0);
+    exit(1);
     return;
   }
 
   /* Initialize the SILC client */
   if (!silc_client_init(silc_client, settings_get_str("user_name"),
                        opt_hostname ? opt_hostname : silc_net_localhost(),
-                       settings_get_str("real_name"))) {
+                       settings_get_str("real_name"), silc_running, NULL)) {
     sleep(1);
-    signal_emit("gui exit", 0);
+    exit(1);
     return;
   }
 
@@ -486,6 +501,7 @@ void silc_core_init(void)
 
   signal_add("setup changed", (SIGNAL_FUNC) sig_setup_changed);
   signal_add("irssi init finished", (SIGNAL_FUNC) sig_init_finished);
+  signal_add("gui exit", (SIGNAL_FUNC) sig_gui_quit);
 
   silc_init_userinfo();
 
@@ -497,7 +513,6 @@ void silc_core_init(void)
   /* Initialize client parameters */
   memset(&params, 0, sizeof(params));
   strcat(params.nickname_format, "%n@%h%a");
-  params.nickname_parse = silc_nickname_format_parse;
   params.connauth_request_secs = settings_get_int("connauth_request_secs");
 
   /* Allocate SILC client */
@@ -555,6 +570,7 @@ void silc_core_deinit(void)
        chat_protocol_find("SILC"));
   signal_remove("setup changed", (SIGNAL_FUNC) sig_setup_changed);
   signal_remove("irssi init finished", (SIGNAL_FUNC) sig_init_finished);
+  signal_remove("gui exit", (SIGNAL_FUNC) sig_gui_quit);
 
   silc_queue_deinit();
   silc_server_deinit();