From 36eff6da2bfe5b183c2b4876bb2afe9dedec9b39 Mon Sep 17 00:00:00 2001 From: Michael Drake Date: Mon, 3 Oct 2011 15:56:47 +0000 Subject: Port more internals to nsurl. Front ends may need updating. svn path=/trunk/netsurf/; revision=12926 --- gtk/dialogs/options.c | 3 ++- gtk/dialogs/source.c | 3 ++- gtk/scaffolding.c | 13 +++++++------ 3 files changed, 11 insertions(+), 8 deletions(-) (limited to 'gtk') diff --git a/gtk/dialogs/options.c b/gtk/dialogs/options.c index 055ebe08b..01e1a1b8c 100644 --- a/gtk/dialogs/options.c +++ b/gtk/dialogs/options.c @@ -579,7 +579,8 @@ ENTRY_CHANGED(entryHomePageURL, option_homepage_url) END_HANDLER BUTTON_CLICKED(setCurrentPage) - const gchar *url = content_get_url(current_browser->current_content); + const gchar *url = nsurl_access(content_get_url( + current_browser->current_content)); gtk_entry_set_text(GTK_ENTRY(entryHomePageURL), url); option_homepage_url = strdup(gtk_entry_get_text(GTK_ENTRY(entryHomePageURL))); diff --git a/gtk/dialogs/source.c b/gtk/dialogs/source.c index 7c58a014e..85a04949b 100644 --- a/gtk/dialogs/source.c +++ b/gtk/dialogs/source.c @@ -166,7 +166,8 @@ void nsgtk_source_dialog_init(GtkWindow *parent, struct browser_window *bw) return; } - thiswindow->url = strdup(content_get_url(bw->current_content)); + thiswindow->url = strdup(nsurl_access(content_get_url( + bw->current_content))); if (thiswindow->url == NULL) { free(thiswindow); free(data); diff --git a/gtk/scaffolding.c b/gtk/scaffolding.c index 534676c6f..5c0366c08 100644 --- a/gtk/scaffolding.c +++ b/gtk/scaffolding.c @@ -619,8 +619,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(content_get_url(nsgtk_get_browser_window( - g->top_level)->current_content), &path, false); + res = url_nice(nsurl_access(content_get_url(nsgtk_get_browser_window( + g->top_level)->current_content)), &path, false); if (res != URL_FUNC_OK) { path = strdup(messages_get("SaveText")); if (path == NULL) { @@ -680,7 +680,8 @@ MULTIHANDLER(pdf) LOG(("Print preview (generating PDF) started.")); - res = url_nice(content_get_url(bw->current_content), &url_name, true); + res = url_nice(nsurl_access(content_get_url(bw->current_content)), + &url_name, true); if (res != URL_FUNC_OK) { warn_user(messages_get(res == URL_FUNC_NOMEM ? "NoMemory" : "URIError"), 0); @@ -754,8 +755,8 @@ MULTIHANDLER(plaintext) char *filename; url_func_result res; - res = url_nice(content_get_url(nsgtk_get_browser_window( - g->top_level)->current_content), &filename, false); + res = url_nice(nsurl_access(content_get_url(nsgtk_get_browser_window( + g->top_level)->current_content)), &filename, false); if (res != URL_FUNC_OK) { filename = strdup(messages_get("SaveText")); if (filename == NULL) { @@ -1407,7 +1408,7 @@ MULTIHANDLER(addbookmarks) if (bw == NULL || bw->current_content == NULL || content_get_url(bw->current_content) == NULL) return TRUE; - hotlist_add_page(content_get_url(bw->current_content)); + hotlist_add_page(nsurl_access(content_get_url(bw->current_content))); return TRUE; } -- cgit v1.2.3