diff options
author | Michael Drake <tlsa@netsurf-browser.org> | 2011-10-03 15:56:47 +0000 |
---|---|---|
committer | Michael Drake <tlsa@netsurf-browser.org> | 2011-10-03 15:56:47 +0000 |
commit | 36eff6da2bfe5b183c2b4876bb2afe9dedec9b39 (patch) | |
tree | 6cc96c71499d22745947113db5c6fc118c286d1f /content/content.c | |
parent | a595d7c4bbe44f7de6c565a4fbbdcff735f0ce99 (diff) | |
download | netsurf-36eff6da2bfe5b183c2b4876bb2afe9dedec9b39.tar.gz netsurf-36eff6da2bfe5b183c2b4876bb2afe9dedec9b39.tar.bz2 |
Port more internals to nsurl. Front ends may need updating.
svn path=/trunk/netsurf/; revision=12926
Diffstat (limited to 'content/content.c')
-rw-r--r-- | content/content.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/content/content.c b/content/content.c index 081674676..7b722a274 100644 --- a/content/content.c +++ b/content/content.c @@ -785,17 +785,17 @@ lwc_string *content__get_mime_type(struct content *c) * \param c Content to retrieve URL from * \return Pointer to URL, or NULL if not found. */ -const char *content_get_url(hlcache_handle *h) +nsurl *content_get_url(hlcache_handle *h) { return content__get_url(hlcache_handle_get_content(h)); } -const char *content__get_url(struct content *c) +nsurl *content__get_url(struct content *c) { if (c == NULL) return NULL; - return nsurl_access(llcache_handle_get_url(c->llcache)); + return llcache_handle_get_url(c->llcache); } /** @@ -970,12 +970,12 @@ void content__invalidate_reuse_data(struct content *c) * \param c Content to retrieve refresh URL from * \return Pointer to URL, or NULL if none */ -const char *content_get_refresh_url(hlcache_handle *h) +nsurl *content_get_refresh_url(hlcache_handle *h) { return content__get_refresh_url(hlcache_handle_get_content(h)); } -const char *content__get_refresh_url(struct content *c) +nsurl *content__get_refresh_url(struct content *c) { if (c == NULL) return NULL; @@ -1159,7 +1159,7 @@ nserror content__clone(const struct content *c, struct content *nc) } if (c->refresh != NULL) { - nc->refresh = talloc_strdup(nc, c->refresh); + nc->refresh = nsurl_ref(c->refresh); if (nc->refresh == NULL) { return NSERROR_NOMEM; } |