From 529ca251fcc47de243e0dba22af83828de3d97e7 Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Mon, 18 Feb 2013 11:51:42 +0000 Subject: rename flags for browser_window routines to be shorter --- amiga/arexx.c | 26 +++++++++--------- amiga/context_menu.c | 30 ++++++++++---------- amiga/download.c | 4 +-- amiga/file.c | 4 +-- amiga/gui.c | 78 ++++++++++++++++++++++++++-------------------------- amiga/menu.c | 18 ++++++------ amiga/tree.c | 4 +-- 7 files changed, 82 insertions(+), 82 deletions(-) mode change 100755 => 100644 amiga/arexx.c mode change 100755 => 100644 amiga/context_menu.c mode change 100755 => 100644 amiga/gui.c mode change 100755 => 100644 amiga/menu.c mode change 100755 => 100644 amiga/tree.c (limited to 'amiga') diff --git a/amiga/arexx.c b/amiga/arexx.c old mode 100755 new mode 100644 index 606f348cb..491fc03bd --- a/amiga/arexx.c +++ b/amiga/arexx.c @@ -248,8 +248,8 @@ STATIC VOID rx_open(struct ARexxCmd *cmd, struct RexxMsg *rxm __attribute__((unu browser_window_navigate(curbw, url, NULL, - BROWSER_WINDOW_GO_FLAG_DOWNLOAD | - BROWSER_WINDOW_GO_FLAG_VERIFIABLE, + BROWSER_WINDOW_DOWNLOAD | + BROWSER_WINDOW_VERIFIABLE, NULL, NULL, NULL); @@ -257,9 +257,9 @@ STATIC VOID rx_open(struct ARexxCmd *cmd, struct RexxMsg *rxm __attribute__((unu } else if(cmd->ac_ArgList[2]) { - browser_window_create(BROWSER_WINDOW_GO_FLAG_VERIFIABLE | - BROWSER_WINDOW_GO_FLAG_HISTORY | - BROWSER_WINDOW_GO_FLAG_TAB, + browser_window_create(BROWSER_WINDOW_VERIFIABLE | + BROWSER_WINDOW_HISTORY | + BROWSER_WINDOW_TAB, url, NULL, NULL, @@ -267,8 +267,8 @@ STATIC VOID rx_open(struct ARexxCmd *cmd, struct RexxMsg *rxm __attribute__((unu } else if(cmd->ac_ArgList[1]) { - browser_window_create(BROWSER_WINDOW_GO_FLAG_VERIFIABLE | - BROWSER_WINDOW_GO_FLAG_HISTORY, + browser_window_create(BROWSER_WINDOW_VERIFIABLE | + BROWSER_WINDOW_HISTORY, url, NULL, NULL, @@ -281,16 +281,16 @@ STATIC VOID rx_open(struct ARexxCmd *cmd, struct RexxMsg *rxm __attribute__((unu browser_window_navigate(bw, url, NULL, - BROWSER_WINDOW_GO_FLAG_HISTORY | - BROWSER_WINDOW_GO_FLAG_VERIFIABLE, + BROWSER_WINDOW_HISTORY | + BROWSER_WINDOW_VERIFIABLE, NULL, NULL, NULL); } else { - browser_window_create(BROWSER_WINDOW_GO_FLAG_VERIFIABLE | - BROWSER_WINDOW_GO_FLAG_HISTORY, + browser_window_create(BROWSER_WINDOW_VERIFIABLE | + BROWSER_WINDOW_HISTORY, url, NULL, NULL, @@ -510,8 +510,8 @@ STATIC VOID rx_home(struct ARexxCmd *cmd, struct RexxMsg *rxm __attribute__((unu browser_window_navigate(bw, url, NULL, - BROWSER_WINDOW_GO_FLAG_HISTORY | - BROWSER_WINDOW_GO_FLAG_VERIFIABLE, + BROWSER_WINDOW_HISTORY | + BROWSER_WINDOW_VERIFIABLE, NULL, NULL, NULL); diff --git a/amiga/context_menu.c b/amiga/context_menu.c old mode 100755 new mode 100644 index 2091f55ca..fd5748c62 --- a/amiga/context_menu.c +++ b/amiga/context_menu.c @@ -780,8 +780,8 @@ static uint32 ami_context_menu_hook(struct Hook *hook,Object *item,APTR reserved case CMID_URLOPENWIN: error = nsurl_create(userdata, &url); if (error == NSERROR_OK) { - error = browser_window_create(BROWSER_WINDOW_GO_FLAG_VERIFIABLE | - BROWSER_WINDOW_GO_FLAG_HISTORY, + error = browser_window_create(BROWSER_WINDOW_VERIFIABLE | + BROWSER_WINDOW_HISTORY, url, hlcache_handle_get_url(gwin->bw->current_content), gwin->bw, @@ -799,9 +799,9 @@ static uint32 ami_context_menu_hook(struct Hook *hook,Object *item,APTR reserved case CMID_URLOPENTAB: error = nsurl_create(userdata, &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, hlcache_handle_get_url(gwin->bw->current_content), gwin->bw, @@ -824,8 +824,8 @@ static uint32 ami_context_menu_hook(struct Hook *hook,Object *item,APTR reserved browser_window_navigate(gwin->bw, url, hlcache_handle_get_url(gwin->bw->current_content), - BROWSER_WINDOW_GO_FLAG_DOWNLOAD | - BROWSER_WINDOW_GO_FLAG_VERIFIABLE, + BROWSER_WINDOW_DOWNLOAD | + BROWSER_WINDOW_VERIFIABLE, NULL, NULL, NULL); @@ -839,8 +839,8 @@ static uint32 ami_context_menu_hook(struct Hook *hook,Object *item,APTR reserved browser_window_navigate(gwin->bw, hlcache_handle_get_url(userdata), hlcache_handle_get_url(gwin->bw->current_content), - BROWSER_WINDOW_GO_FLAG_HISTORY | - BROWSER_WINDOW_GO_FLAG_VERIFIABLE, + BROWSER_WINDOW_HISTORY | + BROWSER_WINDOW_VERIFIABLE, NULL, NULL, NULL); @@ -856,8 +856,8 @@ static uint32 ami_context_menu_hook(struct Hook *hook,Object *item,APTR reserved browser_window_navigate(gwin->bw, url, hlcache_handle_get_url(gwin->bw->current_content), - BROWSER_WINDOW_GO_FLAG_HISTORY | - BROWSER_WINDOW_GO_FLAG_VERIFIABLE, + BROWSER_WINDOW_HISTORY | + BROWSER_WINDOW_VERIFIABLE, NULL, NULL, NULL); @@ -932,8 +932,8 @@ static uint32 ami_context_menu_hook(struct Hook *hook,Object *item,APTR reserved browser_window_navigate(gwin->bw, url, NULL, - BROWSER_WINDOW_GO_FLAG_HISTORY | - BROWSER_WINDOW_GO_FLAG_VERIFIABLE, + BROWSER_WINDOW_HISTORY | + BROWSER_WINDOW_VERIFIABLE, NULL, NULL, NULL); @@ -1004,8 +1004,8 @@ static uint32 ami_context_menu_hook(struct Hook *hook,Object *item,APTR reserved browser_window_navigate(gwin->bw, url, NULL, - BROWSER_WINDOW_GO_FLAG_HISTORY | - BROWSER_WINDOW_GO_FLAG_VERIFIABLE, + BROWSER_WINDOW_HISTORY | + BROWSER_WINDOW_VERIFIABLE, NULL, NULL, NULL); diff --git a/amiga/download.c b/amiga/download.c index 9db05ca49..3d3b95dea 100644 --- a/amiga/download.c +++ b/amiga/download.c @@ -299,8 +299,8 @@ void gui_download_window_done(struct gui_download_window *dw) browser_window_navigate(bw, url, NULL, - BROWSER_WINDOW_GO_FLAG_DOWNLOAD | - BROWSER_WINDOW_GO_FLAG_VERIFIABLE, + BROWSER_WINDOW_DOWNLOAD | + BROWSER_WINDOW_VERIFIABLE, NULL, NULL, NULL); diff --git a/amiga/file.c b/amiga/file.c index 419cc2a4d..12ed12a33 100644 --- a/amiga/file.c +++ b/amiga/file.c @@ -102,8 +102,8 @@ void ami_file_open(struct gui_window_2 *gwin) browser_window_navigate(gwin->bw, url, NULL, - BROWSER_WINDOW_GO_FLAG_HISTORY | - BROWSER_WINDOW_GO_FLAG_VERIFIABLE, + BROWSER_WINDOW_HISTORY | + BROWSER_WINDOW_VERIFIABLE, NULL, NULL, NULL); diff --git a/amiga/gui.c b/amiga/gui.c old mode 100755 new mode 100644 index 0269fa0e5..52878e7a1 --- a/amiga/gui.c +++ b/amiga/gui.c @@ -730,8 +730,8 @@ static void gui_init2(int argc, char** argv) { error = nsurl_create(temp_homepage_url, &url); if (error == NSERROR_OK) { - error = browser_window_create(BROWSER_WINDOW_GO_FLAG_VERIFIABLE | - BROWSER_WINDOW_GO_FLAG_HISTORY, + error = browser_window_create(BROWSER_WINDOW_VERIFIABLE | + BROWSER_WINDOW_HISTORY, url, NULL, NULL, @@ -783,8 +783,8 @@ static void gui_init2(int argc, char** argv) if (error == NSERROR_OK) { if(!first) { - error = browser_window_create(BROWSER_WINDOW_GO_FLAG_VERIFIABLE | - BROWSER_WINDOW_GO_FLAG_HISTORY, + error = browser_window_create(BROWSER_WINDOW_VERIFIABLE | + BROWSER_WINDOW_HISTORY, url, NULL, NULL, @@ -794,8 +794,8 @@ static void gui_init2(int argc, char** argv) } else { - error = browser_window_create(BROWSER_WINDOW_GO_FLAG_VERIFIABLE | - BROWSER_WINDOW_GO_FLAG_HISTORY, + error = browser_window_create(BROWSER_WINDOW_VERIFIABLE | + BROWSER_WINDOW_HISTORY, url, NULL, bw, @@ -881,8 +881,8 @@ static void gui_init2(int argc, char** argv) if(!bw && (nsoption_bool(startup_no_window) == false)) { error = nsurl_create(nsoption_charp(homepage_url), &url); if (error == NSERROR_OK) { - error = browser_window_create(BROWSER_WINDOW_GO_FLAG_VERIFIABLE | - BROWSER_WINDOW_GO_FLAG_HISTORY, + error = browser_window_create(BROWSER_WINDOW_VERIFIABLE | + BROWSER_WINDOW_HISTORY, url, NULL, NULL, @@ -1678,9 +1678,9 @@ void ami_handle_msg(void) error = nsurl_create(nsoption_charp(homepage_url), &urlns); 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, urlns, NULL, gwin->bw, @@ -1710,8 +1710,8 @@ void ami_handle_msg(void) browser_window_navigate(gwin->bw, url, NULL, - BROWSER_WINDOW_GO_FLAG_HISTORY | - BROWSER_WINDOW_GO_FLAG_VERIFIABLE, + BROWSER_WINDOW_HISTORY | + BROWSER_WINDOW_VERIFIABLE, NULL, NULL, NULL); @@ -1739,8 +1739,8 @@ void ami_handle_msg(void) browser_window_navigate(gwin->bw, url, NULL, - BROWSER_WINDOW_GO_FLAG_HISTORY | - BROWSER_WINDOW_GO_FLAG_VERIFIABLE, + BROWSER_WINDOW_HISTORY | + BROWSER_WINDOW_VERIFIABLE, NULL, NULL, NULL); @@ -1759,8 +1759,8 @@ void ami_handle_msg(void) browser_window_navigate(gwin->bw, url, NULL, - BROWSER_WINDOW_GO_FLAG_HISTORY | - BROWSER_WINDOW_GO_FLAG_VERIFIABLE, + BROWSER_WINDOW_HISTORY | + BROWSER_WINDOW_VERIFIABLE, NULL, NULL, NULL); @@ -1830,8 +1830,8 @@ void ami_handle_msg(void) error = nsurl_create(nsoption_charp(homepage_url), &urlns); if (error == NSERROR_OK) { - error = browser_window_create(BROWSER_WINDOW_GO_FLAG_VERIFIABLE | - BROWSER_WINDOW_GO_FLAG_HISTORY, + error = browser_window_create(BROWSER_WINDOW_VERIFIABLE | + BROWSER_WINDOW_HISTORY, urlns, NULL, gwin->bw, @@ -1852,8 +1852,8 @@ void ami_handle_msg(void) error = nsurl_create(nsoption_charp(homepage_url), &urlns); if (error == NSERROR_OK) { - error = browser_window_create(BROWSER_WINDOW_GO_FLAG_VERIFIABLE | - BROWSER_WINDOW_GO_FLAG_HISTORY, + error = browser_window_create(BROWSER_WINDOW_VERIFIABLE | + BROWSER_WINDOW_HISTORY, urlns, NULL, gwin->bw, @@ -2229,8 +2229,8 @@ void ami_handle_appmsg(void) browser_window_navigate(gwin->bw, url, NULL, - BROWSER_WINDOW_GO_FLAG_HISTORY | - BROWSER_WINDOW_GO_FLAG_VERIFIABLE, + BROWSER_WINDOW_HISTORY | + BROWSER_WINDOW_VERIFIABLE, NULL, NULL, NULL); @@ -2239,9 +2239,9 @@ void ami_handle_appmsg(void) } else { - browser_window_create(BROWSER_WINDOW_GO_FLAG_VERIFIABLE | - BROWSER_WINDOW_GO_FLAG_HISTORY | - BROWSER_WINDOW_GO_FLAG_TAB, + browser_window_create(BROWSER_WINDOW_VERIFIABLE | + BROWSER_WINDOW_HISTORY | + BROWSER_WINDOW_TAB, url, NULL, gwin->bw, @@ -2270,8 +2270,8 @@ void ami_handle_appmsg(void) browser_window_navigate(gwin->bw, url, NULL, - BROWSER_WINDOW_GO_FLAG_HISTORY | - BROWSER_WINDOW_GO_FLAG_VERIFIABLE, + BROWSER_WINDOW_HISTORY | + BROWSER_WINDOW_VERIFIABLE, NULL, NULL, NULL); @@ -2280,9 +2280,9 @@ void ami_handle_appmsg(void) } else { - browser_window_create(BROWSER_WINDOW_GO_FLAG_VERIFIABLE | - BROWSER_WINDOW_GO_FLAG_HISTORY | - BROWSER_WINDOW_GO_FLAG_TAB, + browser_window_create(BROWSER_WINDOW_VERIFIABLE | + BROWSER_WINDOW_HISTORY | + BROWSER_WINDOW_TAB, url, NULL, gwin->bw, @@ -2324,8 +2324,8 @@ void ami_handle_applib(void) error = nsurl_create(nsoption_charp(homepage_url), &url); if (error == NSERROR_OK) { - error = browser_window_create(BROWSER_WINDOW_GO_FLAG_VERIFIABLE | - BROWSER_WINDOW_GO_FLAG_HISTORY, + error = browser_window_create(BROWSER_WINDOW_VERIFIABLE | + BROWSER_WINDOW_HISTORY, url, NULL, NULL, @@ -2348,8 +2348,8 @@ void ami_handle_applib(void) error = nsurl_create(tempurl, &url); if (error == NSERROR_OK) { - error = browser_window_create(BROWSER_WINDOW_GO_FLAG_VERIFIABLE | - BROWSER_WINDOW_GO_FLAG_HISTORY, + error = browser_window_create(BROWSER_WINDOW_VERIFIABLE | + BROWSER_WINDOW_HISTORY, url, NULL, NULL, @@ -2374,8 +2374,8 @@ void ami_handle_applib(void) { error = nsurl_create(nsoption_charp(homepage_url), &url); if (error == NSERROR_OK) { - error = browser_window_create(BROWSER_WINDOW_GO_FLAG_VERIFIABLE | - BROWSER_WINDOW_GO_FLAG_HISTORY, + error = browser_window_create(BROWSER_WINDOW_VERIFIABLE | + BROWSER_WINDOW_HISTORY, url, NULL, NULL, @@ -4791,8 +4791,8 @@ void ami_scroller_hook(struct Hook *hook,Object *object,struct IntuiMessage *msg browser_window_navigate(gwin->bw, url, NULL, - BROWSER_WINDOW_GO_FLAG_HISTORY | - BROWSER_WINDOW_GO_FLAG_VERIFIABLE, + BROWSER_WINDOW_HISTORY | + BROWSER_WINDOW_VERIFIABLE, NULL, NULL, NULL); diff --git a/amiga/menu.c b/amiga/menu.c old mode 100755 new mode 100644 index a5fe4c342..af485bcf9 --- a/amiga/menu.c +++ b/amiga/menu.c @@ -705,8 +705,8 @@ static void ami_menu_item_project_newwin(struct Hook *hook, APTR window, struct error = nsurl_create(nsoption_charp(homepage_url), &url); if (error == NSERROR_OK) { - error = browser_window_create(BROWSER_WINDOW_GO_FLAG_VERIFIABLE | - BROWSER_WINDOW_GO_FLAG_HISTORY, + error = browser_window_create(BROWSER_WINDOW_VERIFIABLE | + BROWSER_WINDOW_HISTORY, url, NULL, NULL, @@ -728,9 +728,9 @@ static void ami_menu_item_project_newtab(struct Hook *hook, APTR window, struct error = nsurl_create(nsoption_charp(homepage_url), &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, gwin->bw, @@ -832,8 +832,8 @@ static void ami_menu_item_project_about(struct Hook *hook, APTR window, struct I } if (error == NSERROR_OK) { - error = browser_window_create(BROWSER_WINDOW_GO_FLAG_VERIFIABLE | - BROWSER_WINDOW_GO_FLAG_HISTORY, + error = browser_window_create(BROWSER_WINDOW_VERIFIABLE | + BROWSER_WINDOW_HISTORY, url, NULL, NULL, @@ -1044,8 +1044,8 @@ static void ami_menu_item_hotlist_entries(struct Hook *hook, APTR window, struct browser_window_navigate(gwin->bw, url, NULL, - BROWSER_WINDOW_GO_FLAG_HISTORY | - BROWSER_WINDOW_GO_FLAG_VERIFIABLE, + BROWSER_WINDOW_HISTORY | + BROWSER_WINDOW_VERIFIABLE, NULL, NULL, NULL); diff --git a/amiga/tree.c b/amiga/tree.c old mode 100755 new mode 100644 index 32cd8a1fa..bab8f25fc --- a/amiga/tree.c +++ b/amiga/tree.c @@ -327,8 +327,8 @@ void ami_tree_drag_end(struct treeview_window *twin, int x, int y) browser_window_navigate(gwin->bw, url, NULL, - BROWSER_WINDOW_GO_FLAG_HISTORY | - BROWSER_WINDOW_GO_FLAG_VERIFIABLE, + BROWSER_WINDOW_HISTORY | + BROWSER_WINDOW_VERIFIABLE, NULL, NULL, NULL); -- cgit v1.2.3