summaryrefslogtreecommitdiff
path: root/gtk/scaffolding.c
diff options
context:
space:
mode:
authorJohn Mark Bell <jmb@netsurf-browser.org>2011-12-04 14:55:23 +0000
committerJohn Mark Bell <jmb@netsurf-browser.org>2011-12-04 14:55:23 +0000
commitf2993e6ed037023e28837c7c666627380235bd14 (patch)
tree8d3d27a37e14a49a33a327074d08fb7177b3834c /gtk/scaffolding.c
parent890bb679939c9ecde30af7ed752e292bfe6feb28 (diff)
downloadnetsurf-f2993e6ed037023e28837c7c666627380235bd14.tar.gz
netsurf-f2993e6ed037023e28837c7c666627380235bd14.tar.bz2
content_get_url -> hlcache_handle_get_url, content__get_url -> content_get_url
svn path=/trunk/netsurf/; revision=13236
Diffstat (limited to 'gtk/scaffolding.c')
-rw-r--r--gtk/scaffolding.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/gtk/scaffolding.c b/gtk/scaffolding.c
index a07c57129..26df12ed1 100644
--- a/gtk/scaffolding.c
+++ b/gtk/scaffolding.c
@@ -337,9 +337,9 @@ static void nsgtk_window_update_back_forward(struct gtk_scaffolding *g)
/* update the url bar, particularly necessary when tabbing */
if (bw->current_content != NULL &&
- content_get_url(bw->current_content) != NULL)
+ hlcache_handle_get_url(bw->current_content) != NULL)
browser_window_refresh_url_bar(bw,
- content_get_url(bw->current_content),
+ hlcache_handle_get_url(bw->current_content),
bw->frag_id);
/* update the local history window, as well as queuing a redraw
@@ -621,7 +621,7 @@ MULTIHANDLER(savepage)
gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(fc), filter);
gtk_file_chooser_set_filter(GTK_FILE_CHOOSER(fc), filter);
- res = url_nice(nsurl_access(content_get_url(nsgtk_get_browser_window(
+ res = url_nice(nsurl_access(hlcache_handle_get_url(nsgtk_get_browser_window(
g->top_level)->current_content)), &path, false);
if (res != URL_FUNC_OK) {
path = strdup(messages_get("SaveText"));
@@ -682,7 +682,7 @@ MULTIHANDLER(pdf)
LOG(("Print preview (generating PDF) started."));
- res = url_nice(nsurl_access(content_get_url(bw->current_content)),
+ res = url_nice(nsurl_access(hlcache_handle_get_url(bw->current_content)),
&url_name, true);
if (res != URL_FUNC_OK) {
warn_user(messages_get(res == URL_FUNC_NOMEM ? "NoMemory"
@@ -757,7 +757,7 @@ MULTIHANDLER(plaintext)
char *filename;
url_func_result res;
- res = url_nice(nsurl_access(content_get_url(nsgtk_get_browser_window(
+ res = url_nice(nsurl_access(hlcache_handle_get_url(nsgtk_get_browser_window(
g->top_level)->current_content)), &filename, false);
if (res != URL_FUNC_OK) {
filename = strdup(messages_get("SaveText"));
@@ -1408,9 +1408,9 @@ MULTIHANDLER(addbookmarks)
struct browser_window *bw = nsgtk_get_browser_window(g->top_level);
if (bw == NULL || bw->current_content == NULL ||
- content_get_url(bw->current_content) == NULL)
+ hlcache_handle_get_url(bw->current_content) == NULL)
return TRUE;
- hotlist_add_page(nsurl_access(content_get_url(bw->current_content)));
+ hotlist_add_page(nsurl_access(hlcache_handle_get_url(bw->current_content)));
return TRUE;
}