From 9f72b5e04639e904e71f55cc2385a6ff30ebdc3b Mon Sep 17 00:00:00 2001 From: Michael Drake Date: Mon, 15 Jul 2013 12:57:40 +0100 Subject: Fix namespace of old global history add function. --- desktop/browser.c | 2 +- desktop/history_global_core.c | 8 ++++---- desktop/history_global_core.h | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'desktop') diff --git a/desktop/browser.c b/desktop/browser.c index 1cc369374..2ab93c908 100644 --- a/desktop/browser.c +++ b/desktop/browser.c @@ -1248,7 +1248,7 @@ static nserror browser_window_callback(hlcache_handle *c, urldb_set_url_content_type(url, content_get_type(c)); /* This is safe as we've just added the URL */ - global_history_add(urldb_get_url(url)); + history_global_add(urldb_get_url(url)); } } diff --git a/desktop/history_global_core.c b/desktop/history_global_core.c index 2a941e05d..ce438302f 100644 --- a/desktop/history_global_core.c +++ b/desktop/history_global_core.c @@ -90,7 +90,7 @@ static struct node *history_global_find(const char *url) * \param data URL data associated with URL * \return true (for urldb_iterate_entries) */ -static bool global_history_add_internal(nsurl *url, const struct url_data *data) +static bool history_global_add_internal(nsurl *url, const struct url_data *data) { int i, j; struct node *parent = NULL; @@ -281,7 +281,7 @@ bool history_global_initialise(struct tree *tree, const char* folder_icon_name) LOG(("Building history tree")); global_history_initialised = true; - urldb_iterate_entries(global_history_add_internal); + urldb_iterate_entries(history_global_add_internal); global_history_initialised = false; tree_set_node_expanded(global_history_tree, global_history_tree_root, false, true, true); @@ -316,7 +316,7 @@ void history_global_cleanup(void) * * \param url the url to be added */ -void global_history_add(nsurl *url) +void history_global_add(nsurl *url) { const struct url_data *data; @@ -324,7 +324,7 @@ void global_history_add(nsurl *url) if (data == NULL) return; - global_history_add_internal(url, data); + history_global_add_internal(url, data); } diff --git a/desktop/history_global_core.h b/desktop/history_global_core.h index c55a23cf9..9bf5a0bcd 100644 --- a/desktop/history_global_core.h +++ b/desktop/history_global_core.h @@ -28,7 +28,7 @@ bool history_global_initialise(struct tree *tree, const char* folder_icon_name); unsigned int history_global_get_tree_flags(void); void history_global_cleanup(void); -void global_history_add(nsurl *url); +void history_global_add(nsurl *url); bool history_global_export(const char *path); void history_global_delete_selected(void); -- cgit v1.2.3