diff options
| -rw-r--r-- | src/fe-common/core/Makefile.am | 2 | ||||
| -rw-r--r-- | src/fe-common/core/autorun.c | 55 | ||||
| -rw-r--r-- | src/fe-common/core/autorun.h | 6 | ||||
| -rw-r--r-- | src/fe-common/core/fe-common-core.c | 32 |
4 files changed, 31 insertions, 64 deletions
diff --git a/src/fe-common/core/Makefile.am b/src/fe-common/core/Makefile.am index a804e5fd..eb826414 100644 --- a/src/fe-common/core/Makefile.am +++ b/src/fe-common/core/Makefile.am @@ -7,7 +7,6 @@ INCLUDES = \ -DTHEMESDIR=\""$(datadir)/irssi/themes"\" libfe_common_core_a_SOURCES = \ - autorun.c \ chat-completion.c \ command-history.c \ completion.c \ @@ -42,7 +41,6 @@ libfe_common_core_a_SOURCES = \ pkginc_fe_common_coredir=$(pkgincludedir)/src/fe-common/core pkginc_fe_common_core_HEADERS = \ - autorun.h \ command-history.h \ chat-completion.h \ completion.h \ diff --git a/src/fe-common/core/autorun.c b/src/fe-common/core/autorun.c deleted file mode 100644 index d9b21f54..00000000 --- a/src/fe-common/core/autorun.c +++ /dev/null @@ -1,55 +0,0 @@ -/* - autorun.c : irssi - - 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 - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -*/ - -#include "module.h" -#include "signals.h" -#include "special-vars.h" - -#include "fe-windows.h" - -void autorun_startup(void) -{ - char *path; - GIOChannel *handle; - GString *buf; - gsize tpos; - - /* open ~/.irssi/startup and run all commands in it */ - path = g_strdup_printf("%s/startup", get_irssi_dir()); - handle = g_io_channel_new_file(path, "r", NULL); - g_free(path); - if (handle == NULL) { - /* file not found */ - return; - } - - buf = g_string_sized_new(512); - while (g_io_channel_read_line_string(handle, buf, &tpos, NULL) == G_IO_STATUS_NORMAL) { - buf->str[tpos] = '\0'; - if (buf->str[0] != '#') { - eval_special_string(buf->str, "", - active_win->active_server, - active_win->active); - } - } - g_string_free(buf, TRUE); - - g_io_channel_close(handle); -} diff --git a/src/fe-common/core/autorun.h b/src/fe-common/core/autorun.h deleted file mode 100644 index 59d8e846..00000000 --- a/src/fe-common/core/autorun.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef __AUTORUN_H -#define __AUTORUN_H - -void autorun_startup(void); - -#endif diff --git a/src/fe-common/core/fe-common-core.c b/src/fe-common/core/fe-common-core.c index a8076158..ada22785 100644 --- a/src/fe-common/core/fe-common-core.c +++ b/src/fe-common/core/fe-common-core.c @@ -32,7 +32,7 @@ #include "channels.h" #include "servers-setup.h" -#include "autorun.h" +#include "special-vars.h" #include "fe-core-commands.h" #include "fe-queries.h" #include "hilight-text.h" @@ -392,6 +392,36 @@ static void sig_setup_changed(void) create_windows(); } +static void autorun_startup(void) +{ + char *path; + GIOChannel *handle; + GString *buf; + gsize tpos; + + /* open ~/.irssi/startup and run all commands in it */ + path = g_strdup_printf("%s/startup", get_irssi_dir()); + handle = g_io_channel_new_file(path, "r", NULL); + g_free(path); + if (handle == NULL) { + /* file not found */ + return; + } + + buf = g_string_sized_new(512); + while (g_io_channel_read_line_string(handle, buf, &tpos, NULL) == G_IO_STATUS_NORMAL) { + buf->str[tpos] = '\0'; + if (buf->str[0] != '#') { + eval_special_string(buf->str, "", + active_win->active_server, + active_win->active); + } + } + g_string_free(buf, TRUE); + + g_io_channel_close(handle); +} + void fe_common_core_finish_init(void) { int setup_changed; |