Added SILC Thread Queue API

[crypto.git] / apps / irssi / src / fe-common / core / autorun.c

diff --git a/apps/irssi/src/fe-common/core/autorun.c b/apps/irssi/src/fe-common/core/autorun.c
index f49b6c30b12b5508c7c809cba4ab8feb68bb7d5a..77513a0ded525b18513d0594c83156611f4b9e3a 100644 (file)
--- a/apps/irssi/src/fe-common/core/autorun.c
+++ b/apps/irssi/src/fe-common/core/autorun.c
@@ -1,7 +1,7 @@
 /*
  autorun.c : irssi
 
-    Copyright (C) 1999-2000 Timo Sirainen
+    Copyright (C) 1999-2001 Timo Sirainen
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -25,14 +25,14 @@
 
 #include "fe-windows.h"
 
-static void sig_autorun(void)
+void autorun_startup(void)
 {
        char tmpbuf[1024], *str, *path;
        LINEBUF_REC *buffer = NULL;
        int f, ret, recvlen;
 
-       /* open ~/.silc/startup and run all commands in it */
-       path = g_strdup_printf("%s/.silc/startup", g_get_home_dir());
+       /* open ~/.irssi/startup and run all commands in it */
+       path = g_strdup_printf("%s/startup", get_irssi_dir());
        f = open(path, O_RDONLY);
        g_free(path);
        if (f == -1) {
@@ -44,19 +44,13 @@ static void sig_autorun(void)
                recvlen = read(f, tmpbuf, sizeof(tmpbuf));
 
                ret = line_split(tmpbuf, recvlen, &str, &buffer);
-               if (ret > 0) eval_special_string(str, "", active_win->active_server, active_win->active);
+               if (ret > 0 && *str != '#') {
+                       eval_special_string(str, "",
+                                           active_win->active_server,
+                                           active_win->active);
+               }
        } while (ret > 0);
        line_split_free(buffer);
 
        close(f);
 }
-
-void autorun_init(void)
-{
-       signal_add_last("irssi init finished", (SIGNAL_FUNC) sig_autorun);
-}
-
-void autorun_deinit(void)
-{
-       signal_remove("irssi init finished", (SIGNAL_FUNC) sig_autorun);
-}