about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorMarco Peereboom <marco@conformal.com>2011-08-09 23:05:14 +0000
committerMarco Peereboom <marco@conformal.com>2011-08-09 23:05:14 +0000
commit01de48ad1d5cd495cf323242de9c098e508a9046 (patch)
tree07a6af848ec78b350197dedf6df5529980fa7678
parent995473f19f6d0b4115072910371a69dc380987ca (diff)
downloadxombrero-01de48ad1d5cd495cf323242de9c098e508a9046.tar.gz
notify_load_error_cb clobbers perfectly good URLs in uri_entry when a
popup fails to resolve dns.  I don't get what the point of that
functions is anyway so comment it out.  Raphael please fix or delete
this function.  cvs blame said it was you who broke the precious.
-rw-r--r--xxxterm.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/xxxterm.c b/xxxterm.c
index 95732ca..7ca3d44 100644
--- a/xxxterm.c
+++ b/xxxterm.c
@@ -6323,10 +6323,16 @@ notify_load_status_cb(WebKitWebView* wview, GParamSpec* pspec, struct tab *t)
 	    webkit_web_view_can_go_forward(wview));
 }
 
+#if 0
 gboolean
 notify_load_error_cb(WebKitWebView* wview, WebKitWebFrame *web_frame,
     gchar *uri, gpointer web_error,struct tab *t)
 {
+	/*
+	 * XXX this function is wrong
+	 * it overwrites perfectly good urls with garbage on load errors
+	 * those happen often when popups fail to resolve dns
+	 */
 	if (t->tmp_uri)
 		g_free(t->tmp_uri);
 	t->tmp_uri = g_strdup(uri);
@@ -6337,6 +6343,7 @@ notify_load_error_cb(WebKitWebView* wview, WebKitWebFrame *web_frame,
 
 	return (FALSE);
 }
+#endif
 
 void
 notify_title_cb(WebKitWebView* wview, GParamSpec* pspec, struct tab *t)
@@ -8530,8 +8537,13 @@ create_new_tab(char *title, struct undo *u, int focus, int position)
 	    (char *)NULL);
 	g_signal_connect(t->wv,
 	    "notify::load-status", G_CALLBACK(notify_load_status_cb), t);
+	/*
+	 * XXX this puts invalid url in uri_entry and that is undesirable
+	 */
+#if 0
 	g_signal_connect(t->wv,
 	    "load-error", G_CALLBACK(notify_load_error_cb), t);
+#endif
 	g_signal_connect(t->wv,
 	    "notify::title", G_CALLBACK(notify_title_cb), t);