commit b7d93613a30db99f00bd228a1e3813d1579e95bd
parent 901ae07f0efee9ae463d80882cba7b185d4afd7d
Author: Kyle Milz <kmilz@ucalgary.ca>
Date: Mon, 17 Dec 2012 13:40:23 -0700
buffer: fix error code 204 in load_error
Diffstat:
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/buffer.c b/src/buffer.c
@@ -593,14 +593,19 @@ load_error_cb(void *data, Evas_Object *webview, void *event_info)
{
Eina_Strbuf* buffer;
const Ewk_Error *error = event_info;
+ unsigned int error_code = ewk_error_code_get(error);
/* This is a cancellation, do not display the error page */
if (ewk_error_cancellation_get(error))
return;
+ if (error_code == 204)
+ /* plugin will handle load, no need to report error */
+ return;
+
buffer = eina_strbuf_new();
- eina_strbuf_append_printf(buffer, "<html><body><div style=\"color:#ff0000\">ERROR!</div><br><div>Code: %d<br>Description: %s<br>URL: %s</div></body</html>",
- ewk_error_code_get(error), ewk_error_description_get(error), ewk_error_url_get(error));
+ eina_strbuf_append_printf(buffer, "<html><body><div style=\"color:#0000aa\">ERROR!</div><br><div>Code: %d<br>Description: %s<br>URL: %s</div></body</html>",
+ error_code, ewk_error_description_get(error), ewk_error_url_get(error));
ewk_view_html_string_load(webview, eina_strbuf_string_get(buffer), 0, ewk_error_url_get(error));
eina_strbuf_free(buffer);
@@ -1034,7 +1039,7 @@ buffer_add(const unsigned char flags, Window_Data *wd, const char *url, Session_
evas_object_smart_callback_add(v, "url,changed", url_changed_cb, bd);
evas_object_smart_callback_add(v, "load,progress", load_progress_cb, bd);
evas_object_smart_callback_add(v, "load,finished", load_finished_cb, bd);
- // evas_object_smart_callback_add(v, "load,error", load_error_cb, bd);
+ evas_object_smart_callback_add(v, "load,error", load_error_cb, bd);
/* other */
evas_object_smart_callback_add(v, "inspector,view,create", inspector_cb, bd);
