[epiphany/gnome-3-18] web-view: remove outdated assert on error types



commit bcc8531d62a8e570094a22e96bfbf3f9a3fa0710
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Mon Aug 29 13:42:14 2016 -0500

    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

 embed/ephy-web-view.c |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)
---
diff --git a/embed/ephy-web-view.c b/embed/ephy-web-view.c
index 81daa3d..1ad9600 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:


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]