diff options
author | Michael Drake <tlsa@netsurf-browser.org> | 2014-02-08 15:16:05 +0000 |
---|---|---|
committer | Michael Drake <tlsa@netsurf-browser.org> | 2014-02-08 15:16:05 +0000 |
commit | 41d70c741f31e8c04c774fb5b2b90d284e4d8668 (patch) | |
tree | 138dd609d2e51adb23b506365e1cad58bbfcf179 | |
parent | 7a81fe9165bfde355c462514c0f2a74a811aa5da (diff) | |
download | netsurf-41d70c741f31e8c04c774fb5b2b90d284e4d8668.tar.gz netsurf-41d70c741f31e8c04c774fb5b2b90d284e4d8668.tar.bz2 |
Use browser_window URL accessor.
-rw-r--r-- | gtk/scaffolding.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/gtk/scaffolding.c b/gtk/scaffolding.c index 5c649fc56..11c8292db 100644 --- a/gtk/scaffolding.c +++ b/gtk/scaffolding.c @@ -687,8 +687,8 @@ 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(hlcache_handle_get_url(nsgtk_get_browser_window( - g->top_level)->current_content)), &path, false); + res = url_nice(nsurl_access(browser_window_get_url( + nsgtk_get_browser_window(g->top_level))), &path, false); if (res != URL_FUNC_OK) { path = strdup(messages_get("SaveText")); if (path == NULL) { @@ -747,7 +747,7 @@ MULTIHANDLER(pdf) LOG(("Print preview (generating PDF) started.")); - res = url_nice(nsurl_access(hlcache_handle_get_url(bw->current_content)), + res = url_nice(nsurl_access(browser_window_get_url(bw)), &url_name, true); if (res != URL_FUNC_OK) { warn_user(messages_get(res == URL_FUNC_NOMEM ? "NoMemory" @@ -822,8 +822,9 @@ MULTIHANDLER(plaintext) char *filename; url_func_result res; - res = url_nice(nsurl_access(hlcache_handle_get_url(nsgtk_get_browser_window( - g->top_level)->current_content)), &filename, false); + res = url_nice(nsurl_access(browser_window_get_url( + nsgtk_get_browser_window(g->top_level))), + &filename, false); if (res != URL_FUNC_OK) { filename = strdup(messages_get("SaveText")); if (filename == NULL) { @@ -1523,7 +1524,7 @@ MULTIHANDLER(addbookmarks) if (bw == NULL || bw->current_content == NULL || hlcache_handle_get_url(bw->current_content) == NULL) return TRUE; - hotlist_add_url(hlcache_handle_get_url(bw->current_content)); + hotlist_add_url(browser_window_get_url(bw)); return TRUE; } |