diff options
| author | Vincent Sanders <vince@kyllikki.org> | 2014-10-31 00:24:57 +0000 |
|---|---|---|
| committer | Vincent Sanders <vince@kyllikki.org> | 2014-10-31 00:24:57 +0000 |
| commit | ce3d99191842ded7687dc23c3ccb5f5ccc843558 (patch) | |
| tree | 8bf59a56a3b5eadf727068201acd3e8c51bd9dc9 /gtk | |
| parent | f995616509fc3c0556da49c915375108bf268f38 (diff) | |
| download | netsurf-ce3d99191842ded7687dc23c3ccb5f5ccc843558.tar.gz netsurf-ce3d99191842ded7687dc23c3ccb5f5ccc843558.tar.bz2 | |
use nsurl_nice and remove url_nice
change all callers over to using new API for generating nice filenames
from a url and remove the old API.
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/scaffolding.c | 11 | ||||
| -rw-r--r-- | gtk/viewsource.c | 2 |
2 files changed, 6 insertions, 7 deletions
diff --git a/gtk/scaffolding.c b/gtk/scaffolding.c index 571ba93e9..6e9ec53c3 100644 --- a/gtk/scaffolding.c +++ b/gtk/scaffolding.c @@ -637,8 +637,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(browser_window_get_url( - nsgtk_get_browser_window(g->top_level))), &path, false); + res = nsurl_nice(browser_window_get_url( + nsgtk_get_browser_window(g->top_level)), &path, false); if (res != NSERROR_OK) { path = strdup(messages_get("SaveText")); if (path == NULL) { @@ -697,8 +697,7 @@ MULTIHANDLER(pdf) LOG(("Print preview (generating PDF) started.")); - res = url_nice(nsurl_access(browser_window_get_url(bw)), - &url_name, true); + res = nsurl_nice(browser_window_get_url(bw), &url_name, true); if (res != NSERROR_OK) { warn_user(messages_get_errorcode(res), 0); return TRUE; @@ -771,8 +770,8 @@ MULTIHANDLER(plaintext) char *filename; nserror res; - res = url_nice(nsurl_access(browser_window_get_url( - nsgtk_get_browser_window(g->top_level))), + res = nsurl_nice(browser_window_get_url( + nsgtk_get_browser_window(g->top_level)), &filename, false); if (res != NSERROR_OK) { filename = strdup(messages_get("SaveText")); diff --git a/gtk/viewsource.c b/gtk/viewsource.c index 9c28f6927..3c70bebc2 100644 --- a/gtk/viewsource.c +++ b/gtk/viewsource.c @@ -51,7 +51,7 @@ void nsgtk_viewsource(GtkWindow *parent, struct browser_window *bw) source_data = content_get_source_data(hlcontent, &source_size); - ret = url_nice(nsurl_access(browser_window_get_url(bw)), &filename, false); + ret = nsurl_nice(browser_window_get_url(bw), &filename, false); if (ret != NSERROR_OK) { filename = strdup(messages_get("SaveSource")); if (filename == NULL) { |