diff options
author | Vincent Sanders <vince@netsurf-browser.org> | 2013-02-18 11:51:42 +0000 |
---|---|---|
committer | Vincent Sanders <vince@netsurf-browser.org> | 2013-02-18 11:51:42 +0000 |
commit | 529ca251fcc47de243e0dba22af83828de3d97e7 (patch) | |
tree | 883ace5365cd08f7ea440571974811867b8a74b7 /desktop | |
parent | b112dec78d5e8289ded3f61db96e495690ae96b5 (diff) | |
download | netsurf-529ca251fcc47de243e0dba22af83828de3d97e7.tar.gz netsurf-529ca251fcc47de243e0dba22af83828de3d97e7.tar.bz2 |
rename flags for browser_window routines to be shorter
Diffstat (limited to 'desktop')
-rw-r--r-- | desktop/browser.c | 32 | ||||
-rw-r--r-- | desktop/browser.h | 10 | ||||
-rw-r--r-- | desktop/frames.c | 4 | ||||
-rw-r--r-- | desktop/history_core.c | 4 | ||||
-rw-r--r-- | desktop/searchweb.c | 6 | ||||
-rw-r--r-- | desktop/tree_url_node.c | 6 |
6 files changed, 31 insertions, 31 deletions
diff --git a/desktop/browser.c b/desktop/browser.c index 42b9a1398..ca72c41a2 100644 --- a/desktop/browser.c +++ b/desktop/browser.c @@ -673,7 +673,7 @@ browser_window_create(enum browser_window_nav_flags flags, /* caller must provide window to clone or be adding to history */ assert(clone || - ((flags & BROWSER_WINDOW_GO_FLAG_HISTORY) != 0)); + ((flags & BROWSER_WINDOW_HISTORY) != 0)); if ((bw = calloc(1, sizeof(struct browser_window))) == NULL) { @@ -702,7 +702,7 @@ browser_window_create(enum browser_window_nav_flags flags, bw->window = gui_create_browser_window(bw, top, - ((flags & BROWSER_WINDOW_GO_FLAG_TAB) != 0)); + ((flags & BROWSER_WINDOW_TAB) != 0)); if (bw->window == NULL) { browser_window_destroy(bw); @@ -710,7 +710,7 @@ browser_window_create(enum browser_window_nav_flags flags, } if (url != NULL) { - flags |= BROWSER_WINDOW_GO_FLAG_VERIFIABLE; + flags |= BROWSER_WINDOW_VERIFIABLE; browser_window_navigate(bw, url, referrer, flags, NULL, NULL, NULL); } @@ -832,7 +832,7 @@ nserror browser_window_navigate(struct browser_window *bw, } /* Set up retrieval parameters */ - if ((flags & BROWSER_WINDOW_GO_FLAG_VERIFIABLE) != 0) { + if ((flags & BROWSER_WINDOW_VERIFIABLE) != 0) { fetch_flags |= LLCACHE_RETRIEVE_VERIFIABLE; } @@ -856,7 +856,7 @@ nserror browser_window_navigate(struct browser_window *bw, } /* Get download out of the way */ - if ((flags & BROWSER_WINDOW_GO_FLAG_DOWNLOAD) != 0) { + if ((flags & BROWSER_WINDOW_DOWNLOAD) != 0) { error = browser_window_download(bw, url, referrer, @@ -900,7 +900,7 @@ nserror browser_window_navigate(struct browser_window *bw, nsurl_unref(referrer); } - if ((flags & BROWSER_WINDOW_GO_FLAG_HISTORY) != 0) { + if ((flags & BROWSER_WINDOW_HISTORY) != 0) { history_add(bw->history, bw->current_content, bw->frag_id == NULL ? NULL : @@ -925,12 +925,12 @@ nserror browser_window_navigate(struct browser_window *bw, LOG(("Loading '%s'", nsurl_access(url))); browser_window_set_status(bw, messages_get("Loading")); - if ((flags & BROWSER_WINDOW_GO_FLAG_HISTORY) != 0) { + if ((flags & BROWSER_WINDOW_HISTORY) != 0) { bw->history_add = true; } /* Verifiable fetches may trigger a download */ - if ((flags & BROWSER_WINDOW_GO_FLAG_VERIFIABLE) != 0) { + if ((flags & BROWSER_WINDOW_VERIFIABLE) != 0) { fetch_flags |= HLCACHE_RETRIEVE_MAY_DOWNLOAD; } @@ -1610,7 +1610,7 @@ void browser_window_refresh(void *p) nsurl *url; nsurl *refresh; hlcache_handle *parent = NULL; - enum browser_window_nav_flags flags = BROWSER_WINDOW_GO_FLAG_NONE; + enum browser_window_nav_flags flags = BROWSER_WINDOW_NONE; assert(bw->current_content != NULL && (content_get_status(bw->current_content) == @@ -1629,7 +1629,7 @@ void browser_window_refresh(void *p) url = hlcache_handle_get_url(bw->current_content); if ((url == NULL) || (nsurl_compare(url, refresh, NSURL_COMPLETE))) { - flags |= BROWSER_WINDOW_GO_FLAG_HISTORY; + flags |= BROWSER_WINDOW_HISTORY; } /* Treat an (almost) immediate refresh in a top-level browser window as @@ -1640,7 +1640,7 @@ void browser_window_refresh(void *p) * all. */ if (bw->refresh_interval <= 100 && bw->parent == NULL) { - flags |= BROWSER_WINDOW_GO_FLAG_VERIFIABLE; + flags |= BROWSER_WINDOW_VERIFIABLE; } else { parent = bw->current_content; } @@ -1924,7 +1924,7 @@ void browser_window_reload(struct browser_window *bw, bool all) browser_window_navigate(bw, hlcache_handle_get_url(bw->current_content), NULL, - BROWSER_WINDOW_GO_FLAG_VERIFIABLE, + BROWSER_WINDOW_VERIFIABLE, NULL, NULL, NULL); @@ -2351,8 +2351,8 @@ struct browser_window *browser_window_find_target(struct browser_window *bw, * OR * - button_2 opens in new tab and the link target is "_blank" */ - error = browser_window_create(BROWSER_WINDOW_GO_FLAG_VERIFIABLE | - BROWSER_WINDOW_GO_FLAG_TAB, + error = browser_window_create(BROWSER_WINDOW_VERIFIABLE | + BROWSER_WINDOW_TAB, NULL, NULL, bw, @@ -2378,7 +2378,7 @@ struct browser_window *browser_window_find_target(struct browser_window *bw, * - button_2 doesn't open in new tabs and the link target is * "_blank" */ - error = browser_window_create(BROWSER_WINDOW_GO_FLAG_VERIFIABLE, + error = browser_window_create(BROWSER_WINDOW_VERIFIABLE, NULL, NULL, bw, @@ -2417,7 +2417,7 @@ struct browser_window *browser_window_find_target(struct browser_window *bw, if (!nsoption_bool(target_blank)) return bw; - error = browser_window_create(BROWSER_WINDOW_GO_FLAG_VERIFIABLE, + error = browser_window_create(BROWSER_WINDOW_VERIFIABLE, NULL, NULL, bw, diff --git a/desktop/browser.h b/desktop/browser.h index bcba585e8..cad8bf706 100644 --- a/desktop/browser.h +++ b/desktop/browser.h @@ -64,17 +64,17 @@ extern bool browser_reformat_pending; /** flags to browser window go */ enum browser_window_nav_flags { - BROWSER_WINDOW_GO_FLAG_NONE = 0, + BROWSER_WINDOW_NONE = 0, /** The page is added to the window history, this should * be used when returning to a page in the window history. */ - BROWSER_WINDOW_GO_FLAG_HISTORY = 1, + BROWSER_WINDOW_HISTORY = 1, /** download rather than render the uri */ - BROWSER_WINDOW_GO_FLAG_DOWNLOAD = 2, + BROWSER_WINDOW_DOWNLOAD = 2, /** this transaction is verifiable */ - BROWSER_WINDOW_GO_FLAG_VERIFIABLE = 4, + BROWSER_WINDOW_VERIFIABLE = 4, /** open a new tab rather than a new window */ - BROWSER_WINDOW_GO_FLAG_TAB = 8, + BROWSER_WINDOW_TAB = 8, }; void browser_window_initialise_common(struct browser_window *bw, diff --git a/desktop/frames.c b/desktop/frames.c index 235dc83ef..27085ef3d 100644 --- a/desktop/frames.c +++ b/desktop/frames.c @@ -252,7 +252,7 @@ void browser_window_create_iframes(struct browser_window *bw, browser_window_navigate(window, cur->url, hlcache_handle_get_url(bw->current_content), - BROWSER_WINDOW_GO_FLAG_NONE, + BROWSER_WINDOW_NONE, NULL, NULL, bw->current_content); @@ -389,7 +389,7 @@ void browser_window_create_frameset(struct browser_window *bw, browser_window_navigate(window, frame->url, hlcache_handle_get_url(parent), - BROWSER_WINDOW_GO_FLAG_HISTORY, + BROWSER_WINDOW_HISTORY, NULL, NULL, parent); diff --git a/desktop/history_core.c b/desktop/history_core.c index 48627fa7a..648635258 100644 --- a/desktop/history_core.c +++ b/desktop/history_core.c @@ -462,7 +462,7 @@ void history_go(struct browser_window *bw, current = history->current; history->current = entry; - browser_window_create(BROWSER_WINDOW_GO_FLAG_VERIFIABLE, + browser_window_create(BROWSER_WINDOW_VERIFIABLE, url, NULL, bw, @@ -470,7 +470,7 @@ void history_go(struct browser_window *bw, history->current = current; } else { history->current = entry; - browser_window_navigate(bw, url, NULL, BROWSER_WINDOW_GO_FLAG_VERIFIABLE, NULL, NULL, NULL); + browser_window_navigate(bw, url, NULL, BROWSER_WINDOW_VERIFIABLE, NULL, NULL, NULL); } nsurl_unref(url); diff --git a/desktop/searchweb.c b/desktop/searchweb.c index 4b97ca82c..a90627ac6 100644 --- a/desktop/searchweb.c +++ b/desktop/searchweb.c @@ -71,9 +71,9 @@ bool search_web_new_window(struct browser_window *bw, const char *searchterm) error = nsurl_create(urltxt, &url); if (error == NSERROR_OK) { - error = browser_window_create(BROWSER_WINDOW_GO_FLAG_VERIFIABLE | - BROWSER_WINDOW_GO_FLAG_HISTORY | - BROWSER_WINDOW_GO_FLAG_TAB, + error = browser_window_create(BROWSER_WINDOW_VERIFIABLE | + BROWSER_WINDOW_HISTORY | + BROWSER_WINDOW_TAB, url, NULL, bw, diff --git a/desktop/tree_url_node.c b/desktop/tree_url_node.c index 3b84b4c08..02afcbe9d 100644 --- a/desktop/tree_url_node.c +++ b/desktop/tree_url_node.c @@ -400,10 +400,10 @@ node_callback_resp tree_url_node_callback(void *user_data, error = nsurl_create(text, &url); if (error == NSERROR_OK) { - flags = BROWSER_WINDOW_GO_FLAG_VERIFIABLE | - BROWSER_WINDOW_GO_FLAG_HISTORY; + flags = BROWSER_WINDOW_VERIFIABLE | + BROWSER_WINDOW_HISTORY; if (msg_data->flag == TREE_ELEMENT_LAUNCH_IN_TABS) { - flags |= BROWSER_WINDOW_GO_FLAG_TAB; + flags |= BROWSER_WINDOW_TAB; } error = browser_window_create(flags, url, |