diff options
| author | Vincent Sanders <vince@netsurf-browser.org> | 2013-02-14 15:09:28 +0000 |
|---|---|---|
| committer | Vincent Sanders <vince@netsurf-browser.org> | 2013-02-18 11:23:27 +0000 |
| commit | 3bfb5b96a7c7cb2718a60987e69cd659ed49b9d8 (patch) | |
| tree | 40aa4e52aa50010c8f7c47dda79be2b77339e546 /cocoa/BrowserViewController.m | |
| parent | c545bb4b42dff8bfd4c288e330f52848ec2df6c4 (diff) | |
| download | netsurf-3bfb5b96a7c7cb2718a60987e69cd659ed49b9d8.tar.gz netsurf-3bfb5b96a7c7cb2718a60987e69cd659ed49b9d8.tar.bz2 | |
browser_window_navigate refactor
Diffstat (limited to 'cocoa/BrowserViewController.m')
| -rw-r--r-- | cocoa/BrowserViewController.m | 37 |
1 files changed, 35 insertions, 2 deletions
diff --git a/cocoa/BrowserViewController.m b/cocoa/BrowserViewController.m index f8b26e12f..7a134eedf 100644 --- a/cocoa/BrowserViewController.m +++ b/cocoa/BrowserViewController.m @@ -67,7 +67,23 @@ - (IBAction) navigate: (id) sender; { - browser_window_go( browser, [url UTF8String], NULL, true ); + nsurl *unsrl; + nserror error; + + error = nsurl_create([url UTF8String], &url); + if (error != NSERROR_OK) { + warn_user(messages_get_errorcode(error), 0); + } else { + browser_window_navigate(browser, + nsurl, + NULL, + BROWSER_WINDOW_GO_FLAG_HISTORY | + BROWSER_WINDOW_GO_FLAG_VERIFIABLE, + NULL, + NULL, + NULL); + nsurl_unref(url); + } } - (void) awakeFromNib; @@ -115,7 +131,24 @@ - (IBAction) goHome: (id) sender; { - browser_window_go( browser, nsoption_charp(homepage_url), NULL, true ); + nsurl *url; + nserror error; + + error = nsurl_create(nsoption_charp(homepage_url), &url); + if (error != NSERROR_OK) { + warn_user(messages_get_errorcode(error), 0); + } else { + browser_window_navigate(browser, + url, + NULL, + BROWSER_WINDOW_GO_FLAG_HISTORY | + BROWSER_WINDOW_GO_FLAG_VERIFIABLE, + NULL, + NULL, + NULL); + nsurl_unref(url); + } + } - (IBAction) reloadPage: (id) sender; |