summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmanuele Giaquinta <exg@irssi.org>2007-05-29 08:19:24 +0000
committerexg <exg@dbcabf3a-b0e7-0310-adc4-f8d773084564>2007-05-29 08:19:24 +0000
commit152acd26ec62855f865cb5c1994a6c36680aad99 (patch)
tree42c2501330f09a9d87a18a92bd1caf613404b099
parent7c1a733535331ba260aea20017f1bedbc274760b (diff)
downloadirssi-152acd26ec62855f865cb5c1994a6c36680aad99.zip
Fix build after last change to option processing.
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@4529 dbcabf3a-b0e7-0310-adc4-f8d773084564
-rw-r--r--src/fe-none/irssi.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/fe-none/irssi.c b/src/fe-none/irssi.c
index b8f01a79..ba47aab7 100644
--- a/src/fe-none/irssi.c
+++ b/src/fe-none/irssi.c
@@ -49,17 +49,8 @@ static void sig_reload(void)
void noui_init(void)
{
- static struct poptOption options[] = {
- POPT_AUTOHELP
- { "load", 'l', POPT_ARG_STRING, &autoload_module, 0, "Module to load (default = bot)", "MODULE" },
- { NULL, '\0', 0, NULL }
- };
-
srand(time(NULL));
- autoload_module = NULL;
- args_register(options);
-
irssi_gui = IRSSI_GUI_NONE;
core_init();
irc_init();
@@ -90,13 +81,22 @@ void noui_deinit(void)
int main(int argc, char **argv)
{
- core_init_paths(argc, argv);
+ static struct poptOption options[] = {
+ POPT_AUTOHELP
+ { "load", 'l', POPT_ARG_STRING, &autoload_module, 0, "Module to load (default = bot)", "MODULE" },
+ { NULL, '\0', 0, NULL }
+ };
+
+ autoload_module = NULL;
+ core_register_options();
+ args_register(options);
+ args_execute(argc, argv);
+ core_preinit(argv[0]);
#ifdef HAVE_SOCKS
SOCKSinit(argv[0]);
#endif
noui_init();
- args_execute(argc, argv);
if (autoload_module == NULL)
autoload_module = "bot";