diff options
Diffstat (limited to 'windows/gui.c')
| -rw-r--r-- | windows/gui.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/windows/gui.c b/windows/gui.c index 5072d5c6d..484c15286 100644 --- a/windows/gui.c +++ b/windows/gui.c @@ -2365,7 +2365,7 @@ void gui_quit(void) hubbub_finalise(myrealloc, NULL); } -void gui_init(int argc, char** argv) +static void gui_init(int argc, char** argv) { char buf[PATH_MAX], sbuf[PATH_MAX]; int len; @@ -2380,17 +2380,6 @@ void gui_init(int argc, char** argv) if (he != HUBBUB_OK) die("Unable to initialise HTML parsing library.\n"); - /* load browser messages */ - nsws_find_resource(buf, "messages", "./windows/res/messages"); - LOG(("Using '%s' as Messages file", buf)); - messages_load(buf); - - /* load browser options */ - nsws_find_resource(buf, "preferences", "~/.netsurf/preferences"); - LOG(("Using '%s' as Preferences file", buf)); - options_file_location = strdup(buf); - options_read(buf); - /* set up stylesheet urls */ getcwd(sbuf, PATH_MAX); len = strlen(sbuf); @@ -2451,6 +2440,8 @@ WinMain(HINSTANCE hInstance, HINSTANCE hLastInstance, LPSTR lpcli, int ncmd) int argc = 0, argctemp = 0; size_t len; LPWSTR * argvw; + char options[PATH_MAX]; + char messages[PATH_MAX]; if (SLEN(lpcli) > 0) { argvw = CommandLineToArgvW(GetCommandLineW(), &argc); @@ -2478,8 +2469,17 @@ WinMain(HINSTANCE hInstance, HINSTANCE hLastInstance, LPSTR lpcli, int ncmd) argctemp++; } + /* load browser messages */ + nsws_find_resource(messages, "messages", "./windows/res/messages"); + + /* load browser options */ + nsws_find_resource(options, "preferences", "~/.netsurf/preferences"); + options_file_location = strdup(options); + /* initialise netsurf */ - netsurf_init(argc, argv); + netsurf_init(&argc, &argv, options, messages); + + gui_init(argc, argv); gui_init2(argc, argv); |