Merged from silc_1_0_branch.

[silc.git] / apps / irssi / src / core / core.c

diff --git a/apps/irssi/src/core/core.c b/apps/irssi/src/core/core.c
index f39c50d3e258d9e3cb8e7e4dfcee14bce93cf1ba..7125344ff0bfc08b79db1cdabe509fa39c6d1959 100644 (file)
--- a/apps/irssi/src/core/core.c
+++ b/apps/irssi/src/core/core.c
@@ -59,6 +59,7 @@ void log_away_deinit(void);
 
 int irssi_gui;
 int irssi_init_finished;
+int reload_config;
 
 static char *irssi_dir, *irssi_config_file;
 static GSList *dialog_type_queue, *dialog_text_queue;
@@ -74,15 +75,20 @@ const char *get_irssi_config(void)
         return irssi_config_file;
 }
 
+static void sig_reload_config(int signo)
+{
+        reload_config = TRUE;
+}
+
 static void read_settings(void)
 {
 #ifndef WIN32
        static int signals[] = {
-               SIGHUP, SIGINT, SIGQUIT, SIGTERM,
+               SIGINT, SIGQUIT, SIGTERM,
                SIGALRM, SIGUSR1, SIGUSR2
        };
        static char *signames[] = {
-               "hup", "int", "quit", "term",
+               "int", "quit", "term",
                "alrm", "usr1", "usr2"
        };
 
@@ -95,6 +101,10 @@ static void read_settings(void)
        sigemptyset (&act.sa_mask);
        act.sa_flags = 0;
 
+       /* reload config on SIGHUP */
+        act.sa_handler = sig_reload_config;
+       sigaction(SIGHUP, &act, NULL);
+
        for (n = 0; n < sizeof(signals)/sizeof(signals[0]); n++) {
                act.sa_handler = find_substr(ignores, signames[n]) ?
                        SIG_IGN : SIG_DFL;
@@ -145,10 +155,11 @@ static void sig_init_finished(void)
 void core_init_paths(int argc, char *argv[])
 {
        static struct poptOption options[] = {
-               { "config", 0, POPT_ARG_STRING, NULL, 0, "Configuration file location (~/.irssi/config)", "PATH" },
-               { "home", 0, POPT_ARG_STRING, NULL, 0, "Irssi home dir location (~/.irssi)", "PATH" },
+               { "config", 0, POPT_ARG_STRING, NULL, 0, "Configuration file location (~/.silc/config)", "PATH" },
+               { "home", 0, POPT_ARG_STRING, NULL, 0, "Irssi home dir location (~/.silc)", "PATH" },
                { NULL, '\0', 0, NULL }
        };
+       const char *home;
        char *str;
        int n, len;
 
@@ -181,8 +192,13 @@ void core_init_paths(int argc, char *argv[])
 
        args_register(options);
 
-        if (irssi_dir == NULL)
-               irssi_dir = g_strdup_printf(IRSSI_DIR_FULL, g_get_home_dir());
+       if (irssi_dir == NULL) {
+               home = g_get_home_dir();
+               if (home == NULL)
+                       home = ".";
+
+               irssi_dir = g_strdup_printf(IRSSI_DIR_FULL, home);
+       }
        if (irssi_config_file == NULL)
                irssi_config_file = g_strdup_printf("%s/"IRSSI_HOME_CONFIG, irssi_dir);
 
@@ -249,6 +265,8 @@ void core_init(int argc, char *argv[])
 
 void core_deinit(void)
 {
+       module_uniq_destroy("WINDOW ITEM TYPE");
+
        signal_remove("setup changed", (SIGNAL_FUNC) read_settings);
        signal_remove("irssi init finished", (SIGNAL_FUNC) sig_irssi_init_finished);