diff options
| author | Michael Drake <tlsa@netsurf-browser.org> | 2014-02-10 14:08:45 +0000 |
|---|---|---|
| committer | Michael Drake <tlsa@netsurf-browser.org> | 2014-02-10 14:08:45 +0000 |
| commit | af014bce99d4990f1a0cbb1a779127de0f716a90 (patch) | |
| tree | e013fd671af221d241c23087fc770faab3a64628 /cocoa | |
| parent | 9720c024832c96d917de933b95c87cf2e4f867bf (diff) | |
| download | netsurf-af014bce99d4990f1a0cbb1a779127de0f716a90.tar.gz netsurf-af014bce99d4990f1a0cbb1a779127de0f716a90.tar.bz2 | |
Allow tab creation without history clone. Changes browser_window_create and browser_window_navigate flags.
Diffstat (limited to 'cocoa')
| -rw-r--r-- | cocoa/BookmarksController.m | 7 | ||||
| -rw-r--r-- | cocoa/BrowserView.m | 18 | ||||
| -rw-r--r-- | cocoa/BrowserWindowController.m | 5 | ||||
| -rw-r--r-- | cocoa/NetSurfAppDelegate.m | 12 | ||||
| -rw-r--r-- | cocoa/NetsurfApp.m | 3 |
5 files changed, 19 insertions, 26 deletions
diff --git a/cocoa/BookmarksController.m b/cocoa/BookmarksController.m index 7d7173fd8..4ba66ddfa 100644 --- a/cocoa/BookmarksController.m +++ b/cocoa/BookmarksController.m @@ -142,14 +142,13 @@ static const char *cocoa_hotlist_path( void ) error = browser_window_navigate([tab browser], url, NULL, - BROWSER_WINDOW_HISTORY | - BROWSER_WINDOW_VERIFIABLE, + BW_NAVIGATE_HISTORY | + BW_NAVIGATE_VERIFIABLE, NULL, NULL, NULL); } else { - error = browser_window_create(BROWSER_WINDOW_VERIFIABLE | - BROWSER_WINDOW_HISTORY, + error = browser_window_create(BW_CREATE_HISTORY, url, NULL, NULL, diff --git a/cocoa/BrowserView.m b/cocoa/BrowserView.m index 24214128e..d525832db 100644 --- a/cocoa/BrowserView.m +++ b/cocoa/BrowserView.m @@ -581,9 +581,9 @@ static browser_mouse_state cocoa_mouse_flags_for_event( NSEvent *evt ) error = nsurl_create([[sender representedObject] UTF8String], &url); if (error == NSERROR_OK) { - error = browser_window_create(BROWSER_WINDOW_VERIFIABLE | - BROWSER_WINDOW_HISTORY | - BROWSER_WINDOW_TAB, + error = browser_window_create(BW_CREATE_HISTORY | + BW_CREATE_TAB | + BW_CREATE_CLONE, url, NULL, browser, @@ -602,8 +602,8 @@ static browser_mouse_state cocoa_mouse_flags_for_event( NSEvent *evt ) error = nsurl_create([[sender representedObject] UTF8String], &url); if (error == NSERROR_OK) { - error = browser_window_create(BROWSER_WINDOW_VERIFIABLE | - BROWSER_WINDOW_HISTORY, + error = browser_window_create(BW_CREATE_HISTORY | + BW_CREATE_CLONE, url, NULL, browser, @@ -623,8 +623,8 @@ static browser_mouse_state cocoa_mouse_flags_for_event( NSEvent *evt ) browser_window_navigate(browser, url, NULL, - BROWSER_WINDOW_DOWNLOAD | - BROWSER_WINDOW_VERIFIABLE, + BW_NAVIGATE_DOWNLOAD | + BW_NAVIGATE_VERIFIABLE, NULL, NULL, NULL); @@ -688,8 +688,8 @@ static browser_mouse_state cocoa_mouse_flags_for_event( NSEvent *evt ) browser_window_navigate(browser, url, NULL, - BROWSER_WINDOW_HISTORY | - BROWSER_WINDOW_VERIFIABLE, + BW_NAVIGATE_DOWNLOAD | + BW_NAVIGATE_VERIFIABLE, NULL, NULL, NULL); diff --git a/cocoa/BrowserWindowController.m b/cocoa/BrowserWindowController.m index 36b7164ce..1d70778a1 100644 --- a/cocoa/BrowserWindowController.m +++ b/cocoa/BrowserWindowController.m @@ -161,9 +161,8 @@ error = nsurl_create(NETSURF_HOMEPAGE, &url); } if (error == NSERROR_OK) { - error = browser_window_create(BROWSER_WINDOW_VERIFIABLE | - BROWSER_WINDOW_HISTORY | - BROWSER_WINDOW_TAB, + error = browser_window_create(BW_CREATE_HISTORY | + BW_CREATE_TAB, url, NULL, [activeBrowser browser], diff --git a/cocoa/NetSurfAppDelegate.m b/cocoa/NetSurfAppDelegate.m index c326c9dd6..e17353529 100644 --- a/cocoa/NetSurfAppDelegate.m +++ b/cocoa/NetSurfAppDelegate.m @@ -51,8 +51,7 @@ } if (error == NSERROR_OK) { - error = browser_window_create(BROWSER_WINDOW_VERIFIABLE | - BROWSER_WINDOW_HISTORY, + error = browser_window_create(BW_CREATE_HISTORY, url, NULL, NULL, @@ -75,8 +74,7 @@ for (NSURL *url in [openPanel URLs]) { error = nsurl_create([[url absoluteString] UTF8String], &u); if (error == NSERROR_OK) { - error = browser_window_create(BROWSER_WINDOW_VERIFIABLE | - BROWSER_WINDOW_HISTORY, + error = browser_window_create(BW_CREATE_HISTORY, u, NULL, NULL, @@ -98,8 +96,7 @@ error = nsurl_create([urlAsString UTF8String], &url); if (error == NSERROR_OK) { - error = browser_window_create(BROWSER_WINDOW_VERIFIABLE | - BROWSER_WINDOW_HISTORY, + error = browser_window_create(BW_CREATE_HISTORY, url, NULL, NULL, @@ -182,8 +179,7 @@ error = nsurl_create([[urltxt absoluteString] UTF8String], &url); if (error == NSERROR_OK) { - error = browser_window_create(BROWSER_WINDOW_VERIFIABLE | - BROWSER_WINDOW_HISTORY, + error = browser_window_create(BW_CREATE_HISTORY, url, NULL, NULL, diff --git a/cocoa/NetsurfApp.m b/cocoa/NetsurfApp.m index 5c359114c..88424220d 100644 --- a/cocoa/NetsurfApp.m +++ b/cocoa/NetsurfApp.m @@ -231,8 +231,7 @@ int main( int argc, char **argv ) error = nsurl_create(argv[i], &url); if (error == NSERROR_OK) { - error = browser_window_create(BROWSER_WINDOW_VERIFIABLE | - BROWSER_WINDOW_HISTORY, + error = browser_window_create(BW_CREATE_HISTORY, url, NULL, NULL, |