diff options
author | Vincent Sanders <vince@kyllikki.org> | 2014-05-08 00:16:50 +0100 |
---|---|---|
committer | Vincent Sanders <vince@kyllikki.org> | 2014-05-08 00:16:50 +0100 |
commit | 096bd47ab0018e7b9c3affd58b6134463e2aaa65 (patch) | |
tree | b3975e107568ee9d005e19a5f998c29c55ef1e2f /gtk/scaffolding.c | |
parent | 781d42e33c6cc7d1660eb535c45f70a88b71579e (diff) | |
download | netsurf-096bd47ab0018e7b9c3affd58b6134463e2aaa65.tar.gz netsurf-096bd47ab0018e7b9c3affd58b6134463e2aaa65.tar.bz2 |
refactor url utility functions to use standard nserror codes and have appropriate documentation.
Diffstat (limited to 'gtk/scaffolding.c')
-rw-r--r-- | gtk/scaffolding.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/gtk/scaffolding.c b/gtk/scaffolding.c index fde195657..7ae61dac0 100644 --- a/gtk/scaffolding.c +++ b/gtk/scaffolding.c @@ -672,7 +672,7 @@ MULTIHANDLER(savepage) NULL); DIR *d; char *path; - url_func_result res; + nserror res; GtkFileFilter *filter = gtk_file_filter_new(); gtk_file_filter_set_name(filter, "Directories"); gtk_file_filter_add_custom(filter, GTK_FILE_FILTER_FILENAME, @@ -682,7 +682,7 @@ MULTIHANDLER(savepage) res = url_nice(nsurl_access(browser_window_get_url( nsgtk_get_browser_window(g->top_level))), &path, false); - if (res != URL_FUNC_OK) { + if (res != NSERROR_OK) { path = strdup(messages_get("SaveText")); if (path == NULL) { warn_user("NoMemory", 0); @@ -736,15 +736,14 @@ MULTIHANDLER(pdf) char filename[PATH_MAX]; char dirname[PATH_MAX]; char *url_name; - url_func_result res; + nserror res; LOG(("Print preview (generating PDF) started.")); 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" - : "URIError"), 0); + if (res != NSERROR_OK) { + warn_user(messages_get_errorcode(res), 0); return TRUE; } @@ -812,12 +811,12 @@ MULTIHANDLER(plaintext) GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, NULL); char *filename; - url_func_result res; + nserror res; res = url_nice(nsurl_access(browser_window_get_url( nsgtk_get_browser_window(g->top_level))), &filename, false); - if (res != URL_FUNC_OK) { + if (res != NSERROR_OK) { filename = strdup(messages_get("SaveText")); if (filename == NULL) { warn_user("NoMemory", 0); |