diff options
author | Vincent Sanders <vince@netsurf-browser.org> | 2010-03-29 16:59:30 +0000 |
---|---|---|
committer | Vincent Sanders <vince@netsurf-browser.org> | 2010-03-29 16:59:30 +0000 |
commit | 7e6752726790043bc14c1843690cf9c7d32a6bc6 (patch) | |
tree | b8d51521208881c8c68c4ec7541eb1c966bda020 /riscos | |
parent | 99dee5e3d090a8cd03d1f786fe903b699aa2ac09 (diff) | |
download | netsurf-7e6752726790043bc14c1843690cf9c7d32a6bc6.tar.gz netsurf-7e6752726790043bc14c1843690cf9c7d32a6bc6.tar.bz2 |
first part of initialisation refactor move gui_init2 into frontends
svn path=/trunk/netsurf/; revision=10202
Diffstat (limited to 'riscos')
-rw-r--r-- | riscos/gui.c | 33 |
1 files changed, 18 insertions, 15 deletions
diff --git a/riscos/gui.c b/riscos/gui.c index d2b964146..3f60d5777 100644 --- a/riscos/gui.c +++ b/riscos/gui.c @@ -275,20 +275,6 @@ static void *myrealloc(void *ptr, size_t len, void *pw) return realloc(ptr, len); } -/** Normal entry point from OS */ -int main(int argc, char** argv) -{ - setbuf(stderr, NULL); - - /* initialise netsurf */ - netsurf_init(argc, argv); - - netsurf_main_loop(); - - netsurf_exit(); - - return 0; -} /** * Initialise the gui (RISC OS specific part). @@ -698,7 +684,7 @@ void ro_gui_check_resolvers(void) * Last-minute gui init, after all other modules have initialised. */ -void gui_init2(int argc, char** argv) +static void gui_init2(int argc, char** argv) { char *url = 0; bool open_window = option_open_browser_at_startup; @@ -771,6 +757,23 @@ void gui_init2(int argc, char** argv) free(url); } +/** Normal entry point from OS */ +int main(int argc, char** argv) +{ + setbuf(stderr, NULL); + + /* initialise netsurf */ + netsurf_init(argc, argv); + + gui_init2(argc, argv); + + netsurf_main_loop(); + + netsurf_exit(); + + return 0; +} + /** * Close down the gui (RISC OS). |