From b1138a66d0208b3c51bef17c501bf613baf22bd9 Mon Sep 17 00:00:00 2001 From: Jochen Eisinger Date: Wed, 14 Dec 2005 18:25:31 +0000 Subject: [PATCH] Wed Dec 14 19:21:42 CET 2005 Jochen Eisinger * Honor user set hostname. Also give the user a chance to read the error message. Affected file apps/irssi/src/silc/core/silc-core.c --- CHANGES | 3 +++ apps/irssi/src/silc/core/silc-core.c | 18 ++++++++++++++---- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/CHANGES b/CHANGES index fe3a9789..4b688a6b 100644 --- a/CHANGES +++ b/CHANGES @@ -2,6 +2,9 @@ Wed Dec 14 19:21:42 CET 2005 Jochen Eisinger * Fixed autodist configuration for sic-client. Affected file configure.ad + * Honor user set hostname. Also give the user a chance to + read the error message. Affected file + apps/irssi/src/silc/core/silc-core.c Tue Nov 29 07:52:11 CET 2005 Patrik Weiskircher diff --git a/apps/irssi/src/silc/core/silc-core.c b/apps/irssi/src/silc/core/silc-core.c index 47c927b4..4f4ecf6f 100644 --- a/apps/irssi/src/silc/core/silc-core.c +++ b/apps/irssi/src/silc/core/silc-core.c @@ -343,18 +343,24 @@ static void sig_init_finished(void) { /* Check ~/.silc directory and public and private keys */ if (!silc_client_check_silc_dir()) - exit(1); + goto err; /* Load public and private key */ if (!silc_client_load_keys(silc_client)) - exit(1); + goto err; /* Initialize the SILC client */ if (!silc_client_init(silc_client)) - exit(1); + goto err; /* register SILC scheduler */ idletag = g_timeout_add(5, (GSourceFunc) my_silc_scheduler, NULL); + + return; + +err: + sleep(2); + exit(1); } /* Init SILC. Called from src/fe-text/silc.c */ @@ -457,7 +463,11 @@ void silc_core_init(void) /* Get user information */ silc_client->username = g_strdup(settings_get_str("user_name")); silc_client->nickname = g_strdup(settings_get_str("nick")); - silc_client->hostname = silc_net_localhost(); + if (settings_get_str("hostname") == NULL || + *(settings_get_str("hostname")) == '\0') + silc_client->hostname = silc_net_localhost(); + else + silc_client->hostname = g_strdup(settings_get_str("hostname")); silc_client->realname = g_strdup(settings_get_str("real_name")); silc_log_set_callback(SILC_LOG_INFO, silc_log_misc, NULL); -- 2.24.0