summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Catanzaro <mcatanzaro@gnome.org>2016-08-29 13:42:14 -0500
committerMichael Catanzaro <mcatanzaro@gnome.org>2016-09-10 16:45:03 -0500
commitbcc8531d62a8e570094a22e96bfbf3f9a3fa0710 (patch)
tree2fd20dd498b76a8b4f6a61474eb651f1581ce97f
parent11933540b9d7a96eb622821d53a5aff445da6812 (diff)
downloadepiphany-bcc8531d62a8e570094a22e96bfbf3f9a3fa0710.tar.gz
web-view: remove outdated assert on error types
Show a proper error page when we receive an unexpected error, instead of displaying the error as ASCII text
-rw-r--r--embed/ephy-web-view.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/embed/ephy-web-view.c b/embed/ephy-web-view.c
index 81daa3d02..1ad960091 100644
--- a/embed/ephy-web-view.c
+++ b/embed/ephy-web-view.c
@@ -1994,16 +1994,13 @@ load_failed_cb (WebKitWebView *web_view,
priv->load_failed = TRUE;
ephy_web_view_set_link_message (view, NULL);
- if (error->domain == SOUP_HTTP_ERROR ||
- error->domain == G_TLS_ERROR) {
+ if (error->domain != WEBKIT_NETWORK_ERROR &&
+ error->domain != WEBKIT_POLICY_ERROR &&
+ error->domain != WEBKIT_PLUGIN_ERROR) {
ephy_web_view_load_error_page (view, uri, EPHY_WEB_VIEW_ERROR_PAGE_NETWORK_ERROR, error);
return TRUE;
}
- g_return_val_if_fail ((error->domain == WEBKIT_NETWORK_ERROR) ||
- (error->domain == WEBKIT_POLICY_ERROR) ||
- (error->domain == WEBKIT_PLUGIN_ERROR), FALSE);
-
switch (error->code) {
case WEBKIT_NETWORK_ERROR_FAILED:
case WEBKIT_NETWORK_ERROR_TRANSPORT: