summaryrefslogtreecommitdiff
path: root/amiga/gui.c
diff options
context:
space:
mode:
authorVincent Sanders <vince@netsurf-browser.org>2010-03-29 20:03:44 +0000
committerVincent Sanders <vince@netsurf-browser.org>2010-03-29 20:03:44 +0000
commite00fb7bd2d8eed482d6d9eac1d7fec09e079a25b (patch)
tree04db289d79ecdc38847e22182d9c5d33d4359ed3 /amiga/gui.c
parent7e6752726790043bc14c1843690cf9c7d32a6bc6 (diff)
downloadnetsurf-e00fb7bd2d8eed482d6d9eac1d7fec09e079a25b.tar.gz
netsurf-e00fb7bd2d8eed482d6d9eac1d7fec09e079a25b.tar.bz2
second pass at startup refactor removing the gui_init callback
svn path=/trunk/netsurf/; revision=10205
Diffstat (limited to 'amiga/gui.c')
-rwxr-xr-xamiga/gui.c14
1 files changed, 7 insertions, 7 deletions
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);