summaryrefslogtreecommitdiff
path: root/desktop
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 /desktop
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 'desktop')
-rw-r--r--desktop/browser.c20
-rw-r--r--desktop/frames.c4
-rw-r--r--desktop/history_core.c2
-rw-r--r--desktop/hotlist.c4
-rw-r--r--desktop/save_complete.c8
-rw-r--r--desktop/searchweb.c2
6 files changed, 20 insertions, 20 deletions
diff --git a/desktop/browser.c b/desktop/browser.c
index 614d6b08d..326601254 100644
--- a/desktop/browser.c
+++ b/desktop/browser.c
@@ -898,9 +898,9 @@ void browser_window_go_post(struct browser_window *bw, const char *url,
/* Compare new URL with existing one (ignoring fragments) */
if (bw->current_content != NULL &&
- content_get_url(bw->current_content) != NULL) {
+ hlcache_handle_get_url(bw->current_content) != NULL) {
same_url = nsurl_compare(nsurl,
- content_get_url(bw->current_content),
+ hlcache_handle_get_url(bw->current_content),
NSURL_COMPLETE);
}
@@ -920,7 +920,7 @@ void browser_window_go_post(struct browser_window *bw, const char *url,
browser_window_update(bw, false);
if (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);
}
return;
@@ -1088,7 +1088,7 @@ static void browser_window_update_favicon(hlcache_handle *c,
lwc_string *scheme;
bool speculative_default = false;
- nsurl = content_get_url(c);
+ nsurl = hlcache_handle_get_url(c);
scheme = nsurl_get_component(nsurl, NSURL_SCHEME);
@@ -1153,7 +1153,7 @@ nserror browser_window_callback(hlcache_handle *c,
if (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);
}
break;
@@ -1205,7 +1205,7 @@ nserror browser_window_callback(hlcache_handle *c,
gui_window_new_content(bw->window);
browser_window_refresh_url_bar(bw,
- content_get_url(bw->current_content),
+ hlcache_handle_get_url(bw->current_content),
bw->frag_id);
/* new content; set scroll_to_top */
@@ -1215,7 +1215,7 @@ nserror browser_window_callback(hlcache_handle *c,
/* history */
if (bw->history_add && bw->history) {
- const char *url = nsurl_access(content_get_url(c));
+ const char *url = nsurl_access(hlcache_handle_get_url(c));
history_add(bw->history, c, bw->frag_id == NULL ? NULL :
lwc_string_data(bw->frag_id));
@@ -1472,7 +1472,7 @@ void browser_window_refresh(void *p)
/* mark this content as invalid so it gets flushed from the cache */
content_invalidate_reuse_data(bw->current_content);
- url = nsurl_access(content_get_url(bw->current_content));
+ url = nsurl_access(hlcache_handle_get_url(bw->current_content));
if (url != NULL && strcmp(url, refresh) == 0)
history_add = false;
@@ -1703,7 +1703,7 @@ void browser_window_stop(struct browser_window *bw)
if (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);
}
@@ -1756,7 +1756,7 @@ void browser_window_reload(struct browser_window *bw, bool all)
content_invalidate_reuse_data(bw->current_content);
browser_window_go(bw, nsurl_access(
- content_get_url(bw->current_content)), 0, false);
+ hlcache_handle_get_url(bw->current_content)), 0, false);
}
diff --git a/desktop/frames.c b/desktop/frames.c
index 3667e3fde..02e1ccc54 100644
--- a/desktop/frames.c
+++ b/desktop/frames.c
@@ -244,7 +244,7 @@ void browser_window_create_iframes(struct browser_window *bw,
/* fetch iframe's content */
browser_window_go_unverifiable(window,
nsurl_access(cur->url),
- nsurl_access(content_get_url(
+ nsurl_access(hlcache_handle_get_url(
bw->current_content)),
false, bw->current_content);
}
@@ -378,7 +378,7 @@ void browser_window_create_frameset(struct browser_window *bw,
if (frame->url) {
browser_window_go_unverifiable(window,
nsurl_access(frame->url),
- nsurl_access(content_get_url(
+ nsurl_access(hlcache_handle_get_url(
parent)),
true,
parent);
diff --git a/desktop/history_core.c b/desktop/history_core.c
index 95d28fb3d..21e402f1e 100644
--- a/desktop/history_core.c
+++ b/desktop/history_core.c
@@ -242,7 +242,7 @@ void history_add(struct history *history, hlcache_handle *content,
return;
/* TODO: use a nsurl? */
- error = nsurl_get(content_get_url(content), NSURL_WITH_FRAGMENT,
+ error = nsurl_get(hlcache_handle_get_url(content), NSURL_WITH_FRAGMENT,
&url, &url_len);
if (error != NSERROR_OK) {
warn_user("NoMemory", 0);
diff --git a/desktop/hotlist.c b/desktop/hotlist.c
index 347f4264f..788722d20 100644
--- a/desktop/hotlist.c
+++ b/desktop/hotlist.c
@@ -223,12 +223,12 @@ static void hotlist_visited_internal(hlcache_handle *content, struct node *node)
const char *url;
if (content == NULL ||
- content_get_url(content) == NULL ||
+ hlcache_handle_get_url(content) == NULL ||
hotlist_tree == NULL)
return;
/* TODO: do this with a nsurl instead */
- url = nsurl_access(content_get_url(content));
+ url = nsurl_access(hlcache_handle_get_url(content));
for (; node; node = tree_node_get_next(node)) {
if (!tree_node_is_folder(node)) {
diff --git a/desktop/save_complete.c b/desktop/save_complete.c
index 9e123ce17..956a7f7e3 100644
--- a/desktop/save_complete.c
+++ b/desktop/save_complete.c
@@ -171,7 +171,7 @@ bool save_complete_html(hlcache_handle *c, const char *path, bool index,
css_data = content_get_source_data(css, &css_size);
source = rewrite_stylesheet_urls(css_data, css_size,
- &source_len, nsurl_access(content_get_url(css)),
+ &source_len, nsurl_access(hlcache_handle_get_url(css)),
*list);
if (!source) {
warn_user("NoMemory", 0);
@@ -325,7 +325,7 @@ bool save_imported_sheets(struct nscss_import *imports, uint32_t count,
css_data = content_get_source_data(css, &css_size);
source = rewrite_stylesheet_urls(css_data, css_size,
- &source_len, nsurl_access(content_get_url(css)),
+ &source_len, nsurl_access(hlcache_handle_get_url(css)),
*list);
if (!source) {
warn_user("NoMemory", 0);
@@ -747,7 +747,7 @@ hlcache_handle * save_complete_list_find(const char *url,
struct save_complete_entry *entry;
for (entry = list; entry; entry = entry->next)
if (strcmp(url, nsurl_access(
- content_get_url(entry->content))) == 0)
+ hlcache_handle_get_url(entry->content))) == 0)
return entry->content;
return 0;
}
@@ -813,7 +813,7 @@ bool save_complete_inventory(const char *path,
for (entry = list; entry; entry = entry->next) {
fprintf(fp, "%p %s\n", entry->content,
- nsurl_access(content_get_url(entry->content)));
+ nsurl_access(hlcache_handle_get_url(entry->content)));
}
fclose(fp);
diff --git a/desktop/searchweb.c b/desktop/searchweb.c
index 381ceeeba..128fbc55e 100644
--- a/desktop/searchweb.c
+++ b/desktop/searchweb.c
@@ -291,7 +291,7 @@ nserror search_web_ico_callback(hlcache_handle *ico,
break;
case CONTENT_MSG_DONE:
- LOG(("got favicon '%s'", nsurl_access(content_get_url(ico))));
+ LOG(("got favicon '%s'", nsurl_access(hlcache_handle_get_url(ico))));
gui_window_set_search_ico(search_ico);
break;