summaryrefslogtreecommitdiff
path: root/desktop/history_core.c
diff options
context:
space:
mode:
authorMichael Drake <tlsa@netsurf-browser.org>2012-10-11 11:20:02 +0100
committerMichael Drake <tlsa@netsurf-browser.org>2012-10-11 11:20:02 +0100
commitd9e7d5810678c1470808c3de63f7bde412b3d17b (patch)
tree68d47410cb177d0125127ac186c2a05127b82097 /desktop/history_core.c
parent5a5eab9a1ea7bf6dd79420668c2c0df1a3ea88f5 (diff)
downloadnetsurf-d9e7d5810678c1470808c3de63f7bde412b3d17b.tar.gz
netsurf-d9e7d5810678c1470808c3de63f7bde412b3d17b.tar.bz2
Fix up ripples from urldb change.
Diffstat (limited to 'desktop/history_core.c')
-rw-r--r--desktop/history_core.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/desktop/history_core.c b/desktop/history_core.c
index 21e402f1e..177de6b29 100644
--- a/desktop/history_core.c
+++ b/desktop/history_core.c
@@ -227,6 +227,7 @@ void history_add(struct history *history, hlcache_handle *content,
const char *frag_id)
{
struct history_entry *entry;
+ nsurl *nsurl = hlcache_handle_get_url(content);
char *url;
char *title;
struct bitmap *bitmap;
@@ -242,8 +243,7 @@ void history_add(struct history *history, hlcache_handle *content,
return;
/* TODO: use a nsurl? */
- error = nsurl_get(hlcache_handle_get_url(content), NSURL_WITH_FRAGMENT,
- &url, &url_len);
+ error = nsurl_get(nsurl, NSURL_WITH_FRAGMENT, &url, &url_len);
if (error != NSERROR_OK) {
warn_user("NoMemory", 0);
free(entry);
@@ -281,7 +281,7 @@ void history_add(struct history *history, hlcache_handle *content,
/* if we have a thumbnail, don't update until the page has finished
* loading */
- bitmap = urldb_get_thumbnail(url);
+ bitmap = urldb_get_thumbnail(nsurl);
if (!bitmap) {
bitmap = bitmap_create(WIDTH, HEIGHT,
BITMAP_NEW | BITMAP_CLEAR_MEMORY |
@@ -290,7 +290,7 @@ void history_add(struct history *history, hlcache_handle *content,
warn_user("NoMemory", 0);
return;
}
- if (thumbnail_create(content, bitmap, url) == false) {
+ if (thumbnail_create(content, bitmap, nsurl) == false) {
/* Thumbnailing failed. Ignore it silently */
bitmap_destroy(bitmap);
bitmap = NULL;
@@ -329,7 +329,7 @@ void history_update(struct history *history, hlcache_handle *content)
free(history->current->page.title);
history->current->page.title = title;
- thumbnail_create(content, history->current->bitmap, 0);
+ thumbnail_create(content, history->current->bitmap, NULL);
}