summaryrefslogtreecommitdiff
path: root/desktop/history_core.c
diff options
context:
space:
mode:
authorMichael Drake <tlsa@netsurf-browser.org>2011-10-03 15:56:47 +0000
committerMichael Drake <tlsa@netsurf-browser.org>2011-10-03 15:56:47 +0000
commit36eff6da2bfe5b183c2b4876bb2afe9dedec9b39 (patch)
tree6cc96c71499d22745947113db5c6fc118c286d1f /desktop/history_core.c
parenta595d7c4bbe44f7de6c565a4fbbdcff735f0ce99 (diff)
downloadnetsurf-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 'desktop/history_core.c')
-rw-r--r--desktop/history_core.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/desktop/history_core.c b/desktop/history_core.c
index 70e8f158c..11db6b7f9 100644
--- a/desktop/history_core.c
+++ b/desktop/history_core.c
@@ -226,11 +226,12 @@ struct history_entry *history_clone_entry(struct history *history,
void history_add(struct history *history, hlcache_handle *content,
char *frag_id)
{
- url_func_result res;
struct history_entry *entry;
char *url;
char *title;
struct bitmap *bitmap;
+ nserror error;
+ size_t url_len;
assert(history);
assert(content);
@@ -240,8 +241,10 @@ void history_add(struct history *history, hlcache_handle *content,
if (entry == NULL)
return;
- res = url_normalize(content_get_url(content), &url);
- if (res != URL_FUNC_OK) {
+ /* TODO: use a nsurl? */
+ error = nsurl_get(content_get_url(content), NSURL_WITH_FRAGMENT,
+ &url, &url_len);
+ if (error != NSERROR_OK) {
warn_user("NoMemory", 0);
free(entry);
return;