Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/ea28b07cae4d0d40850be... ...commit http://git.netsurf-browser.org/netsurf.git/commit/ea28b07cae4d0d40850be14... ...tree http://git.netsurf-browser.org/netsurf.git/tree/ea28b07cae4d0d40850be1417... The branch, stevef/hotlist has been updated via ea28b07cae4d0d40850be1417bd00e555e6168fb (commit) from 604108916923146c888e6659bd5df24fab460e41 (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/commit/?id=ea28b07cae4d0d40850... commit ea28b07cae4d0d40850be1417bd00e555e6168fb Author: Steve Fryatt <stevef(a)netsurf-browser.org&gt; Commit: Steve Fryatt <stevef(a)netsurf-browser.org&gt; Add confirm_hotlist_remove option to allow users to turn URL removal query off. diff --git a/riscos/hotlist.c b/riscos/hotlist.c index b29ba7e..f47d05e 100644 --- a/riscos/hotlist.c +++ b/riscos/hotlist.c @@ -629,12 +629,21 @@ void ro_gui_hotlist_remove_page(nsurl *url) hotlist_delete_url = NULL; } - hotlist_query = query_user("RemoveHotlist", NULL, &remove_funcs, NULL, - messages_get("Remove"), messages_get("DontRemove")); + /* Check with the user before removing the URL, unless they don't + * want us to be careful in which case just do it. + */ - hotlist_delete_url = nsurl_ref(url); + if (nsoption_bool(confirm_hotlist_remove)) { + hotlist_query = query_user("RemoveHotlist", NULL, + &remove_funcs, NULL, + messages_get("Remove"), + messages_get("DontRemove")); - // hotlist_remove_url(url); + hotlist_delete_url = nsurl_ref(url); + } else { + hotlist_remove_url(url); + ro_toolbar_update_all_hotlists(); + } } diff --git a/riscos/options.h b/riscos/options.h index 9ee3592..cb2b78b 100644 --- a/riscos/options.h +++ b/riscos/options.h @@ -53,6 +53,7 @@ NSOPTION_BOOL(no_plugins, false) NSOPTION_BOOL(block_popups, false) NSOPTION_BOOL(strip_extensions, false) NSOPTION_BOOL(confirm_overwrite, true) +NSOPTION_BOOL(confirm_hotlist_remove, true) NSOPTION_STRING(url_path, "NetSurf:URL") NSOPTION_STRING(url_save, CHOICES_PREFIX "URL") NSOPTION_STRING(hotlist_path, "NetSurf:Hotlist") ----------------------------------------------------------------------- Summary of changes: riscos/hotlist.c | 17 +++++++++++++---- riscos/options.h | 1 + 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/riscos/hotlist.c b/riscos/hotlist.c index b29ba7e..f47d05e 100644 --- a/riscos/hotlist.c +++ b/riscos/hotlist.c @@ -629,12 +629,21 @@ void ro_gui_hotlist_remove_page(nsurl *url) hotlist_delete_url = NULL; } - hotlist_query = query_user("RemoveHotlist", NULL, &remove_funcs, NULL, - messages_get("Remove"), messages_get("DontRemove")); + /* Check with the user before removing the URL, unless they don't + * want us to be careful in which case just do it. + */ - hotlist_delete_url = nsurl_ref(url); + if (nsoption_bool(confirm_hotlist_remove)) { + hotlist_query = query_user("RemoveHotlist", NULL, + &remove_funcs, NULL, + messages_get("Remove"), + messages_get("DontRemove")); - // hotlist_remove_url(url); + hotlist_delete_url = nsurl_ref(url); + } else { + hotlist_remove_url(url); + ro_toolbar_update_all_hotlists(); + } } diff --git a/riscos/options.h b/riscos/options.h index 9ee3592..cb2b78b 100644 --- a/riscos/options.h +++ b/riscos/options.h @@ -53,6 +53,7 @@ NSOPTION_BOOL(no_plugins, false) NSOPTION_BOOL(block_popups, false) NSOPTION_BOOL(strip_extensions, false) NSOPTION_BOOL(confirm_overwrite, true) +NSOPTION_BOOL(confirm_hotlist_remove, true) NSOPTION_STRING(url_path, "NetSurf:URL") NSOPTION_STRING(url_save, CHOICES_PREFIX "URL") NSOPTION_STRING(hotlist_path, "NetSurf:Hotlist") -- NetSurf Browser