From e00fb7bd2d8eed482d6d9eac1d7fec09e079a25b Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Mon, 29 Mar 2010 20:03:44 +0000 Subject: second pass at startup refactor removing the gui_init callback svn path=/trunk/netsurf/; revision=10205 --- amiga/gui.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'amiga') diff --git a/amiga/gui.c b/amiga/gui.c index d45436828..c11bdc6c4 100755 --- a/amiga/gui.c +++ b/amiga/gui.c @@ -202,10 +202,9 @@ STRPTR ami_locale_langs(void) return acceptlangs; } -void ami_messages_load(void) +void ami_messages_load(char *lang) { struct Locale *locale; - char lang[100]; int i; BPTR lock = 0; bool found=FALSE; @@ -245,8 +244,6 @@ void ami_messages_load(void) } CloseLocale(locale); - - messages_load(lang); } void ami_open_resources(void) @@ -408,8 +405,6 @@ void gui_init(int argc, char** argv) ami_print_init(); ami_clipboard_init(); - options_read("PROGDIR:Resources/Options"); - ami_messages_load(); ami_set_options(); /* check options and set defaults where required */ win_destroyed = false; @@ -685,8 +680,13 @@ static void gui_init2(int argc, char** argv) int main(int argc, char** argv) { setbuf(stderr, NULL); + char messages[100]; + + ami_messages_load(messages); + + netsurf_init(argc, argv, "PROGDIR:Resources/Options", messages); - netsurf_init(argc, argv); + gui_init(argc, argv); gui_init2(argc, argv); -- cgit v1.2.3