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 /cocoa/BrowserView.m | |
| parent | 3bfb5b96a7c7cb2718a60987e69cd659ed49b9d8 (diff) | |
| download | netsurf-b112dec78d5e8289ded3f61db96e495690ae96b5.tar.gz netsurf-b112dec78d5e8289ded3f61db96e495690ae96b5.tar.bz2 | |
change browser_window_create and refactor all callsites
Diffstat (limited to 'cocoa/BrowserView.m')
| -rw-r--r-- | cocoa/BrowserView.m | 35 |
1 files changed, 33 insertions, 2 deletions
diff --git a/cocoa/BrowserView.m b/cocoa/BrowserView.m index 63efac468..aed2230b9 100644 --- a/cocoa/BrowserView.m +++ b/cocoa/BrowserView.m @@ -575,12 +575,43 @@ static browser_mouse_state cocoa_mouse_flags_for_event( NSEvent *evt ) - (IBAction) cmOpenURLInTab: (id) sender; { - browser_window_create( [[sender representedObject] UTF8String], browser, NULL, true, true ); + nsurl *url; + nserror error; + + error = nsurl_create([[sender representedObject] UTF8String], &url); + if (error == NSERROR_OK) { + error = browser_window_create(BROWSER_WINDOW_GO_FLAG_VERIFIABLE | + BROWSER_WINDOW_GO_FLAG_HISTORY | + BROWSER_WINDOW_GO_FLAG_TAB, + url, + NULL, + browser, + NULL); + nsurl_unref(url); + } + if (error != NSERROR_OK) { + warn_user(messages_get_errorcode(error), 0); + } } - (IBAction) cmOpenURLInWindow: (id) sender; { - browser_window_create( [[sender representedObject] UTF8String], browser, NULL, true, false ); + nsurl *url; + nserror error; + + error = nsurl_create([[sender representedObject] UTF8String], &url); + if (error == NSERROR_OK) { + error = browser_window_create(BROWSER_WINDOW_GO_FLAG_VERIFIABLE | + BROWSER_WINDOW_GO_FLAG_HISTORY, + url, + NULL, + browser, + NULL); + nsurl_unref(url); + } + if (error != NSERROR_OK) { + warn_user(messages_get_errorcode(error), 0); + } } - (IBAction) cmDownloadURL: (id) sender; |