jrd/irssi
1
0
Fork 0
forked from PsychoticNinja/irssi
Code Issues Pull Requests Projects Releases Wiki Activity

Move autorun_startup in fe-common-core.c and remove autorun.{c,h}.

Browse Source 
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@4785 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Emanuele Giaquinta 2008-03-29 18:15:34 +00:00 committed by exg
parent 7e4bc5c7f4
commit 683738e935
4 changed files with 31 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/fe-common/core/Makefile.am
View File

@ -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 \

55
src/fe-common/core/autorun.c
View File

@ -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);
}

6
src/fe-common/core/autorun.h
View File

@ -1,6 +0,0 @@
#ifndef __AUTORUN_H
#define __AUTORUN_H
void autorun_startup(void);
#endif

32
src/fe-common/core/fe-common-core.c
View File

@ -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;