Add confirm_hotlist_remove option to allow users to turn URL removal query off.

1 files changed, 13 insertions, 4 deletions

diff --git a/riscos/hotlist.c b/riscos/hotlist.c
index b29ba7e19..f47d05e9c 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();
+	}
 }