mirrors
/
netsurf
mirror of https://github.com/netsurf-browser/netsurf
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use browser_window URL accessor.

This commit is contained in:
Michael Drake 2014-02-08 15:16:05 +00:00
parent 7a81fe9165
commit 41d70c741f
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gtk/scaffolding.c
View File

@ -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;
}