From 52bdd72c715c97911bee09055acec8ea30986599 Mon Sep 17 00:00:00 2001 From: John Mark Bell Date: Sat, 15 Apr 2006 15:23:23 +0000 Subject: Ensure hotlist URLs are retained in the database Reduce number of unconditional calls to urldb_get_url_data svn path=/trunk/netsurf/; revision=2531 --- riscos/gui.c | 6 ++++-- riscos/hotlist.c | 16 ++++++++++------ 2 files changed, 14 insertions(+), 8 deletions(-) (limited to 'riscos') diff --git a/riscos/gui.c b/riscos/gui.c index 826861789..512b7bf43 100644 --- a/riscos/gui.c +++ b/riscos/gui.c @@ -1526,9 +1526,11 @@ void ro_msg_dataload(wimp_message *message) } else if ((hotlist_tree) && ((wimp_w)hotlist_tree->handle == message->data.data_xfer.w)) { data = urldb_get_url_data(url); - if (!data) + if (!data) { urldb_add_url(url); - data = urldb_get_url_data(url); + urldb_update_url_visit_data(url); + data = urldb_get_url_data(url); + } if (data) { ro_gui_tree_get_tree_coordinates(hotlist_tree, message->data.data_xfer.pos.x, diff --git a/riscos/hotlist.c b/riscos/hotlist.c index fa67098c1..f40484929 100644 --- a/riscos/hotlist.c +++ b/riscos/hotlist.c @@ -103,10 +103,13 @@ void ro_gui_hotlist_initialise(void) { for (i = 0; i != ENTRIES_COUNT; i++) { data = urldb_get_url_data(default_entries[i].url); - if (!data) + if (!data) { urldb_add_url(default_entries[i].url); - - data = urldb_get_url_data(default_entries[i].url); + urldb_update_url_visit_data( + default_entries[i].url); + data = urldb_get_url_data( + default_entries[i].url); + } if (data) { tree_create_URL_node(node, default_entries[i].url, data, @@ -309,10 +312,11 @@ bool ro_gui_hotlist_dialog_apply(wimp_w w) { if (!node) { if (url) { data = urldb_get_url_data(url); - if (!data) + if (!data) { urldb_add_url(url); - - data = urldb_get_url_data(url); + urldb_update_url_visit_data(url); + data = urldb_get_url_data(url); + } if (!data) { free(url); free(title); -- cgit v1.2.3