Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/3ef843fcb420c94665981... ...commit http://git.netsurf-browser.org/netsurf.git/commit/3ef843fcb420c9466598151... ...tree http://git.netsurf-browser.org/netsurf.git/tree/3ef843fcb420c94665981519d... The branch, master has been updated via 3ef843fcb420c94665981519dacdd8d8c03b8ed0 (commit) via 6b7e67847643dc54ade072c83c5669d7093fb1a3 (commit) from 5ee1f09dd2f1535613d1ad88359150f4c6ac53b6 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commitdiff http://git.netsurf-browser.org/netsurf.git/commitdiff/3ef843fcb420c946659... commit 3ef843fcb420c94665981519dacdd8d8c03b8ed0 Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; Switch Yes/No Replace/Don'tReplace so Esc operates the "don't do anything" operation as expected. diff --git a/amiga/download.c b/amiga/download.c index 224ac29..4243e6d 100644 --- a/amiga/download.c +++ b/amiga/download.c @@ -416,7 +416,7 @@ BOOL ami_download_check_overwrite(const char *file, struct Window *win, ULONG si overwritetext = ASPrintf(messages_get("OverwriteFile")); } - res = ami_warn_user_multi(overwritetext, "DontReplace", "Replace", win); + res = ami_warn_user_multi(overwritetext, "Replace", "DontReplace", win); FreeVec(overwritetext); } else return TRUE; diff --git a/amiga/gui.c b/amiga/gui.c index 22a50fa..c30489e 100755 --- a/amiga/gui.c +++ b/amiga/gui.c @@ -3346,7 +3346,7 @@ void ami_close_all_tabs(struct gui_window_2 *gwin) if((gwin->tabs > 1) && (nsoption_bool(tab_close_warn) == true)) { char *req_body = ami_utf8_easy(messages_get("MultiTabClose")); - int32 res = ami_warn_user_multi(req_body, "No", "Yes", gwin->win); + int32 res = ami_warn_user_multi(req_body, "Yes", "No", gwin->win); free(req_body); if(res == 1) return; commitdiff http://git.netsurf-browser.org/netsurf.git/commitdiff/6b7e67847643dc54ade... commit 6b7e67847643dc54ade072c83c5669d7093fb1a3 Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; Only bother with the delayed requester on OS4 diff --git a/amiga/gui.c b/amiga/gui.c index 522f66a..22a50fa 100755 --- a/amiga/gui.c +++ b/amiga/gui.c @@ -2311,6 +2311,8 @@ void ami_quit_netsurf(void) void ami_quit_netsurf_delayed(void) { + int res = -1; +#ifdef __amigaos4__ char *utf8text = ami_utf8_easy(messages_get("TCPIPShutdown")); char *utf8gadgets = ami_utf8_easy(messages_get("AbortShutdown")); @@ -2326,7 +2328,7 @@ void ami_quit_netsurf_delayed(void) free(utf8text); free(utf8gadgets); - +#endif if(res == -1) { /* Requester timed out */ nsoption_set_bool(tab_close_warn, false); ami_quit_netsurf(); ----------------------------------------------------------------------- Summary of changes: amiga/download.c | 2 +- amiga/gui.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/amiga/download.c b/amiga/download.c index 224ac29..4243e6d 100644 --- a/amiga/download.c +++ b/amiga/download.c @@ -416,7 +416,7 @@ BOOL ami_download_check_overwrite(const char *file, struct Window *win, ULONG si overwritetext = ASPrintf(messages_get("OverwriteFile")); } - res = ami_warn_user_multi(overwritetext, "DontReplace", "Replace", win); + res = ami_warn_user_multi(overwritetext, "Replace", "DontReplace", win); FreeVec(overwritetext); } else return TRUE; diff --git a/amiga/gui.c b/amiga/gui.c index 522f66a..c30489e 100755 --- a/amiga/gui.c +++ b/amiga/gui.c @@ -2311,6 +2311,8 @@ void ami_quit_netsurf(void) void ami_quit_netsurf_delayed(void) { + int res = -1; +#ifdef __amigaos4__ char *utf8text = ami_utf8_easy(messages_get("TCPIPShutdown")); char *utf8gadgets = ami_utf8_easy(messages_get("AbortShutdown")); @@ -2326,7 +2328,7 @@ void ami_quit_netsurf_delayed(void) free(utf8text); free(utf8gadgets); - +#endif if(res == -1) { /* Requester timed out */ nsoption_set_bool(tab_close_warn, false); ami_quit_netsurf(); @@ -3344,7 +3346,7 @@ void ami_close_all_tabs(struct gui_window_2 *gwin) if((gwin->tabs > 1) && (nsoption_bool(tab_close_warn) == true)) { char *req_body = ami_utf8_easy(messages_get("MultiTabClose")); - int32 res = ami_warn_user_multi(req_body, "No", "Yes", gwin->win); + int32 res = ami_warn_user_multi(req_body, "Yes", "No", gwin->win); free(req_body); if(res == 1) return; -- NetSurf Browser