summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Young <chris@unsatisfactorysoftware.co.uk>2014-11-10 19:01:30 +0000
committerChris Young <chris@unsatisfactorysoftware.co.uk>2014-11-10 19:01:30 +0000
commit098fbb628b34683711d841c29d4ca390b0d41dce (patch)
tree1acc919c1ede5271e4f1fadb9c3c5fee4f20fc6b
parent225161b05edb7fb5104ad0c42e216b19d12a5692 (diff)
downloadnetsurf-098fbb628b34683711d841c29d4ca390b0d41dce.tar.gz
netsurf-098fbb628b34683711d841c29d4ca390b0d41dce.tar.bz2
Move some init functions together for the sake of clarity
-rw-r--r--amiga/gui.c17
1 files changed, 6 insertions, 11 deletions
diff --git a/amiga/gui.c b/amiga/gui.c
index 6ce4cb17c..8a05f4b9f 100644
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -5300,29 +5300,24 @@ int main(int argc, char** argv)
}
search_web_init(nsoption_charp(search_engines_file));
-
ami_clipboard_init();
ami_openurl_open();
+ ami_amiupdate(); /* set env-vars for AmiUpdate */
+ ami_init_fonts();
+ ami_context_menu_init();
+ save_complete_init();
+ ami_theme_init();
+ ami_init_mouse_pointers();
win_destroyed = false;
nsscreentitle = ASPrintf("NetSurf %s",netsurf_version);
-
ami_font_setdevicedpi(0); /* for early font requests, eg treeview init */
- ami_amiupdate(); /* set env-vars for AmiUpdate */
- ami_init_fonts();
-
- ami_context_menu_init();
-
window_list = NewObjList();
urldb_load(nsoption_charp(url_file));
urldb_load_cookies(nsoption_charp(cookie_file));
- save_complete_init();
- ami_theme_init();
- ami_init_mouse_pointers();
-
gui_init2(argc, argv);
ami_gui_splash_close(splash_window);