diff options
| author | Vincent Sanders <vince@netsurf-browser.org> | 2013-02-14 18:21:11 +0000 |
|---|---|---|
| committer | Vincent Sanders <vince@netsurf-browser.org> | 2013-02-18 11:23:48 +0000 |
| commit | b112dec78d5e8289ded3f61db96e495690ae96b5 (patch) | |
| tree | 9babaed21ed2eb841b8d398e28814544c73656d9 /windows/main.c | |
| parent | 3bfb5b96a7c7cb2718a60987e69cd659ed49b9d8 (diff) | |
| download | netsurf-b112dec78d5e8289ded3f61db96e495690ae96b5.tar.gz netsurf-b112dec78d5e8289ded3f61db96e495690ae96b5.tar.bz2 | |
change browser_window_create and refactor all callsites
Diffstat (limited to 'windows/main.c')
| -rw-r--r-- | windows/main.c | 27 |
1 files changed, 22 insertions, 5 deletions
diff --git a/windows/main.c b/windows/main.c index 7d158660a..50449df56 100644 --- a/windows/main.c +++ b/windows/main.c @@ -100,8 +100,9 @@ WinMain(HINSTANCE hInstance, HINSTANCE hLastInstance, LPSTR lpcli, int ncmd) LPWSTR *argvw; char *messages; nserror ret; - struct browser_window *bw; - const char *addr = NETSURF_HOMEPAGE; + const char *addr; + nsurl *url; + nserror error; if (SLEN(lpcli) > 0) { argvw = CommandLineToArgvW(GetCommandLineW(), &argc); @@ -150,14 +151,30 @@ WinMain(HINSTANCE hInstance, HINSTANCE hLastInstance, LPSTR lpcli, int ncmd) /* If there is a url specified on the command line use it */ if (argc > 1) { addr = argv[1]; - } else { + } else if (nsoption_charp(homepage_url) != NULL) { addr = nsoption_charp(homepage_url); + } else { + addr = NETSURF_HOMEPAGE; } LOG(("calling browser_window_create")); - bw = browser_window_create(addr, 0, 0, true, false); - netsurf_main_loop(); + error = nsurl_create(addr, &url); + if (error == NSERROR_OK) { + error = browser_window_create(BROWSER_WINDOW_GO_FLAG_VERIFIABLE | + BROWSER_WINDOW_GO_FLAG_HISTORY, + url, + NULL, + NULL, + NULL); + nsurl_unref(url); + + } + if (error != NSERROR_OK) { + warn_user(messages_get_errorcode(error), 0); + } else { + netsurf_main_loop(); + } netsurf_exit(); |