diff options
Diffstat (limited to 'gtk')
-rw-r--r-- | gtk/dialogs/source.c | 4 | ||||
-rw-r--r-- | gtk/download.c | 2 | ||||
-rw-r--r-- | gtk/fetch.c | 6 | ||||
-rw-r--r-- | gtk/scaffolding.c | 15 |
4 files changed, 13 insertions, 14 deletions
diff --git a/gtk/dialogs/source.c b/gtk/dialogs/source.c index 326e3fbc9..c53c67fe4 100644 --- a/gtk/dialogs/source.c +++ b/gtk/dialogs/source.c @@ -369,10 +369,10 @@ gboolean nsgtk_on_source_save_as_activate(GtkMenuItem *widget, gpointer g) GTK_RESPONSE_ACCEPT, NULL); char *filename; - url_func_result res; + nserror res; res = url_nice(nsg->url, &filename, false); - if (res != URL_FUNC_OK) { + if (res != NSERROR_OK) { filename = strdup(messages_get("SaveSource")); if (filename == NULL) { warn_user("NoMemory", 0); diff --git a/gtk/download.c b/gtk/download.c index e49e66ef3..2f7250b5f 100644 --- a/gtk/download.c +++ b/gtk/download.c @@ -733,7 +733,7 @@ gui_download_window_create(download_context *ctx, struct gui_window *gui) if (download == NULL) return NULL; - if (url_host(url, &domain) != URL_FUNC_OK) { + if (url_host(url, &domain) != NSERROR_OK) { domain = g_strdup(messages_get("gtkUnknownHost")); if (domain == NULL) { free(download); diff --git a/gtk/fetch.c b/gtk/fetch.c index a76ad9f4d..c1857ab48 100644 --- a/gtk/fetch.c +++ b/gtk/fetch.c @@ -256,16 +256,16 @@ static char *url_to_path(const char *url) { char *path; char *respath; - url_func_result res; /* result from url routines */ + nserror res; /* result from url routines */ res = url_path(url, &path); - if (res != URL_FUNC_OK) { + if (res != NSERROR_OK) { return NULL; } res = url_unescape(path, &respath); free(path); - if (res != URL_FUNC_OK) { + if (res != NSERROR_OK) { return NULL; } 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); |