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 /riscos/iconbar.c | |
parent | 3bfb5b96a7c7cb2718a60987e69cd659ed49b9d8 (diff) | |
download | netsurf-b112dec78d5e8289ded3f61db96e495690ae96b5.tar.gz netsurf-b112dec78d5e8289ded3f61db96e495690ae96b5.tar.bz2 |
change browser_window_create and refactor all callsites
Diffstat (limited to 'riscos/iconbar.c')
-rw-r--r-- | riscos/iconbar.c | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/riscos/iconbar.c b/riscos/iconbar.c index 24d8661cc..a23f4063c 100644 --- a/riscos/iconbar.c +++ b/riscos/iconbar.c @@ -118,15 +118,30 @@ void ro_gui_iconbar_initialise(void) bool ro_gui_iconbar_click(wimp_pointer *pointer) { int key_down = 0; + nsurl *url; + nserror error; switch (pointer->buttons) { case wimp_CLICK_SELECT: if (nsoption_charp(homepage_url) != NULL) { - browser_window_create(nsoption_charp(homepage_url), - NULL, 0, true, false); + error = nsurl_create(nsoption_charp(homepage_url), &url); } else { - browser_window_create(NETSURF_HOMEPAGE, - NULL, 0, true, false); + error = nsurl_create(NETSURF_HOMEPAGE, &url); + } + + /* create an initial browser window */ + 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); } break; |