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/BookmarksController.m | |
parent | c545bb4b42dff8bfd4c288e330f52848ec2df6c4 (diff) | |
download | netsurf-3bfb5b96a7c7cb2718a60987e69cd659ed49b9d8.tar.gz netsurf-3bfb5b96a7c7cb2718a60987e69cd659ed49b9d8.tar.bz2 |
browser_window_navigate refactor
Diffstat (limited to 'cocoa/BookmarksController.m')
-rw-r--r-- | cocoa/BookmarksController.m | 33 |
1 files changed, 26 insertions, 7 deletions
diff --git a/cocoa/BookmarksController.m b/cocoa/BookmarksController.m index 78bbec004..bb43b2fde 100644 --- a/cocoa/BookmarksController.m +++ b/cocoa/BookmarksController.m @@ -128,15 +128,34 @@ static const char *cocoa_hotlist_path( void ) - (IBAction) openBookmarkURL: (id) sender; { - const char *url = [[sender representedObject] UTF8String]; - NSParameterAssert( url != NULL ); - - BrowserViewController *tab = [(NetSurfApp *)NSApp frontTab]; - if (tab != nil) { - browser_window_go( [tab browser], url, NULL, true ); + const char *urltxt = [[sender representedObject] UTF8String]; + NSParameterAssert( urltxt != NULL ); + + nsurl *url; + nserror error; + + error = nsurl_create(urltxt, &url); + if (error != NSERROR_OK) { + warn_user(messages_get_errorcode(error), 0); } else { - browser_window_create( url, NULL, NULL, true, false ); + BrowserViewController *tab = [(NetSurfApp *)NSApp frontTab]; + if (tab != nil) { + browser_window_navigate([tab browser], + url, + NULL, + BROWSER_WINDOW_GO_FLAG_HISTORY | + BROWSER_WINDOW_GO_FLAG_VERIFIABLE, + NULL, + NULL, + NULL); + } else { + browser_window_create( url, NULL, NULL, true, false ); + } + + nsurl_unref(url); } + + } - (IBAction) addBookmark: (id) sender; |