diff options
| author | Vincent Sanders <vince@netsurf-browser.org> | 2013-02-18 12:24:49 +0000 |
|---|---|---|
| committer | Vincent Sanders <vince@netsurf-browser.org> | 2013-02-18 12:24:49 +0000 |
| commit | 0eb07988730fc5cb475eb84c418f02e3b43b7afa (patch) | |
| tree | 943cbc1c31af2664436c2d07642a556d0924b8e0 /riscos | |
| parent | 529ca251fcc47de243e0dba22af83828de3d97e7 (diff) | |
| download | netsurf-0eb07988730fc5cb475eb84c418f02e3b43b7afa.tar.gz netsurf-0eb07988730fc5cb475eb84c418f02e3b43b7afa.tar.bz2 | |
fix errors introduced in refactor
Diffstat (limited to 'riscos')
| -rw-r--r-- | riscos/gui.c | 2 | ||||
| -rw-r--r-- | riscos/iconbar.c | 21 | ||||
| -rw-r--r-- | riscos/uri.c | 9 |
3 files changed, 22 insertions, 10 deletions
diff --git a/riscos/gui.c b/riscos/gui.c index 2eb3942bc..a8ae53920 100644 --- a/riscos/gui.c +++ b/riscos/gui.c @@ -781,7 +781,7 @@ static void gui_init2(int argc, char** argv) nsurl *urlns; nserror errorns; - errorns = nsurl_create(yrl, &urlns); + errorns = nsurl_create(url, &urlns); if (errorns == NSERROR_OK) { errorns = browser_window_create(BROWSER_WINDOW_VERIFIABLE | BROWSER_WINDOW_HISTORY, diff --git a/riscos/iconbar.c b/riscos/iconbar.c index 77a135587..00d16b4fa 100644 --- a/riscos/iconbar.c +++ b/riscos/iconbar.c @@ -130,7 +130,6 @@ bool ro_gui_iconbar_click(wimp_pointer *pointer) } /* create an initial browser window */ - error = nsurl_create(addr, &url); if (error == NSERROR_OK) { error = browser_window_create(BROWSER_WINDOW_VERIFIABLE | BROWSER_WINDOW_HISTORY, @@ -193,15 +192,29 @@ void ro_gui_iconbar_menu_warning(wimp_w w, wimp_i i, wimp_menu *menu, bool ro_gui_iconbar_menu_select(wimp_w w, wimp_i i, wimp_menu *menu, wimp_selection *selection, menu_action action) { + nsurl *url; + nserror error; + if (w != wimp_ICON_BAR || i != wimp_ICON_WINDOW) return false; switch (action) { case HELP_OPEN_CONTENTS: - browser_window_create( - "http://www.netsurf-browser.org/documentation/", - NULL, 0, true, false); + error = nsurl_create("http://www.netsurf-browser.org/documentation/", &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); + } return true; + case BROWSER_NAVIGATE_URL: ro_gui_dialog_prepare_open_url(); ro_gui_dialog_open_persistent(NULL, dialog_openurl, true); diff --git a/riscos/uri.c b/riscos/uri.c index 4b40329a1..e278999b8 100644 --- a/riscos/uri.c +++ b/riscos/uri.c @@ -41,22 +41,21 @@ void ro_uri_message_received(wimp_message *msg) uri_h uri_handle; char* uri_requested; int uri_length; - nsurl *nsurl; nsurl *url; nserror error; uri_handle = uri_message->handle; - if (nsurl_create(uri_message->uri, &nsurl) != NSERROR_OK) { + if (nsurl_create(uri_message->uri, &url) != NSERROR_OK) { return; } - if (!fetch_can_fetch(nsurl)) { - nsurl_unref(nsurl); + if (!fetch_can_fetch(url)) { + nsurl_unref(url); return; } - nsurl_unref(nsurl); + nsurl_unref(url); uri_message->your_ref = uri_message->my_ref; uri_message->action = message_URI_PROCESS_ACK; |