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 /gtk | |
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 'gtk')
-rw-r--r-- | gtk/dialogs/about.c | 8 | ||||
-rw-r--r-- | gtk/dialogs/source.c | 3 | ||||
-rw-r--r-- | gtk/gui.c | 3 | ||||
-rw-r--r-- | gtk/scaffolding.c | 53 |
4 files changed, 29 insertions, 38 deletions
diff --git a/gtk/dialogs/about.c b/gtk/dialogs/about.c index eb662c873..1ebcb283b 100644 --- a/gtk/dialogs/about.c +++ b/gtk/dialogs/about.c @@ -37,8 +37,8 @@ nsgtk_about_dialog_credits(GtkWidget *button, gpointer data) browser_window_navigate(bw, url, NULL, - BROWSER_WINDOW_HISTORY | - BROWSER_WINDOW_VERIFIABLE, + BW_NAVIGATE_HISTORY | + BW_NAVIGATE_VERIFIABLE, NULL, NULL, NULL); @@ -60,8 +60,8 @@ nsgtk_about_dialog_licence(GtkWidget *button, gpointer data) browser_window_navigate(bw, url, NULL, - BROWSER_WINDOW_HISTORY | - BROWSER_WINDOW_VERIFIABLE, + BW_NAVIGATE_HISTORY | + BW_NAVIGATE_VERIFIABLE, NULL, NULL, NULL); diff --git a/gtk/dialogs/source.c b/gtk/dialogs/source.c index 4f1839d80..326e3fbc9 100644 --- a/gtk/dialogs/source.c +++ b/gtk/dialogs/source.c @@ -313,8 +313,7 @@ void nsgtk_source_tab_init(GtkWindow *parent, struct browser_window *bw) if (error != NSERROR_OK) { warn_user(messages_get_errorcode(error), 0); } else { - error = browser_window_create(BROWSER_WINDOW_VERIFIABLE | - BROWSER_WINDOW_TAB, + error = browser_window_create(BW_CREATE_TAB, url, NULL, bw, @@ -462,8 +462,7 @@ static void gui_init(int argc, char** argv, char **respath) /* create an initial browser window */ error = nsurl_create(addr, &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/gtk/scaffolding.c b/gtk/scaffolding.c index c4ea674d8..cd54548c1 100644 --- a/gtk/scaffolding.c +++ b/gtk/scaffolding.c @@ -437,8 +437,8 @@ gboolean nsgtk_window_url_activate_event(GtkWidget *widget, gpointer data) browser_window_navigate(bw, url, NULL, - BROWSER_WINDOW_HISTORY | - BROWSER_WINDOW_VERIFIABLE, + BW_NAVIGATE_HISTORY | + BW_NAVIGATE_VERIFIABLE, NULL, NULL, NULL); @@ -550,8 +550,8 @@ static void nsgtk_openfile_open(const char *filename) browser_window_navigate(bw, url, NULL, - BROWSER_WINDOW_HISTORY | - BROWSER_WINDOW_VERIFIABLE, + BW_NAVIGATE_HISTORY | + BW_NAVIGATE_VERIFIABLE, NULL, NULL, NULL); @@ -578,7 +578,7 @@ MULTIHANDLER(newwindow) error = nsurl_create(addr, &url); if (error == NSERROR_OK) { - error = browser_window_create(BROWSER_WINDOW_VERIFIABLE, + error = browser_window_create(BW_CREATE_HISTORY, url, NULL, bw, @@ -611,8 +611,8 @@ nserror nsgtk_scaffolding_new_tab(struct gui_window *gw) } } - error = browser_window_create(BROWSER_WINDOW_VERIFIABLE | - BROWSER_WINDOW_TAB, + error = browser_window_create(BW_CREATE_HISTORY | + BW_CREATE_TAB, url, NULL, bw, @@ -959,8 +959,8 @@ MENUHANDLER(savelink) browser_window_navigate(bw, url, NULL, - BROWSER_WINDOW_DOWNLOAD | - BROWSER_WINDOW_VERIFIABLE, + BW_NAVIGATE_DOWNLOAD | + BW_NAVIGATE_VERIFIABLE, NULL, NULL, NULL); @@ -986,12 +986,9 @@ MENUHANDLER(link_openwin) error = nsurl_create(current_menu_ctx.link_url, &url); if (error == NSERROR_OK) { - error = browser_window_create(BROWSER_WINDOW_VERIFIABLE | - BROWSER_WINDOW_HISTORY, - url, - NULL, - bw, - NULL); + error = browser_window_create( + BW_CREATE_CLONE | BW_CREATE_HISTORY, + url, NULL, bw, NULL); nsurl_unref(url); } if (error != NSERROR_OK) { @@ -1019,13 +1016,9 @@ MENUHANDLER(link_opentab) error = nsurl_create(current_menu_ctx.link_url, &url); if (error == NSERROR_OK) { - error = browser_window_create(BROWSER_WINDOW_VERIFIABLE | - BROWSER_WINDOW_HISTORY | - BROWSER_WINDOW_TAB, - url, - NULL, - bw, - NULL); + error = browser_window_create(BW_CREATE_CLONE | + BW_CREATE_HISTORY | BW_CREATE_TAB, + url, NULL, bw, NULL); nsurl_unref(url); } if (error != NSERROR_OK) { @@ -1466,8 +1459,8 @@ MULTIHANDLER(home) browser_window_navigate(bw, url, NULL, - BROWSER_WINDOW_HISTORY | - BROWSER_WINDOW_VERIFIABLE, + BW_NAVIGATE_HISTORY | + BW_NAVIGATE_VERIFIABLE, NULL, NULL, NULL); @@ -1583,8 +1576,8 @@ MULTIHANDLER(contents) browser_window_navigate(bw, url, NULL, - BROWSER_WINDOW_HISTORY | - BROWSER_WINDOW_VERIFIABLE, + BW_NAVIGATE_HISTORY | + BW_NAVIGATE_VERIFIABLE, NULL, NULL, NULL); @@ -1605,8 +1598,8 @@ MULTIHANDLER(guide) browser_window_navigate(bw, url, NULL, - BROWSER_WINDOW_HISTORY | - BROWSER_WINDOW_VERIFIABLE, + BW_NAVIGATE_HISTORY | + BW_NAVIGATE_VERIFIABLE, NULL, NULL, NULL); @@ -1627,8 +1620,8 @@ MULTIHANDLER(info) browser_window_navigate(bw, url, NULL, - BROWSER_WINDOW_HISTORY | - BROWSER_WINDOW_VERIFIABLE, + BW_NAVIGATE_HISTORY | + BW_NAVIGATE_VERIFIABLE, NULL, NULL, NULL); |