diff options
author | Daiki Ueno <ueno@unixuser.org> | 2010-09-02 12:35:41 +0900 |
---|---|---|
committer | Daiki Ueno <ueno@unixuser.org> | 2010-09-02 12:36:35 +0900 |
commit | c202a6b79eb3658c12ba2077cb175a2fe5ae30a1 (patch) | |
tree | 497b0c9dafb01aa6290b9ee299248a65889dc910 /src/callbacks.c | |
parent | 1d4b7c0763a89066faa717adea4d35e7a0ad8458 (diff) |
Fix crash on "Open Image in New Window" (FS#231).
- create_web_view_js2_cb(): don't destroy web_view if uri is not a
"javascript:" URI.
- create_web_view_js_cb(): fix g_object_connect() call which must terminate
with a NULL signal name.
Diffstat (limited to 'src/callbacks.c')
-rw-r--r-- | src/callbacks.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/callbacks.c b/src/callbacks.c index d2352b2..37f392a 100644 --- a/src/callbacks.c +++ b/src/callbacks.c @@ -703,11 +703,10 @@ create_web_view_js2_cb (WebKitWebView* web_view, GParamSpec param_spec) { if (strncmp(uri, "javascript:", strlen("javascript:")) == 0) { eval_js(uzbl.gui.web_view, (gchar*) uri + strlen("javascript:"), NULL, "javascript:"); + gtk_widget_destroy(GTK_WIDGET(web_view)); } else send_event(NEW_WINDOW, uri, NULL); - - gtk_widget_destroy(GTK_WIDGET(web_view)); } @@ -717,7 +716,7 @@ create_web_view_js_cb (WebKitWebView* web_view, gpointer user_data) { (void) user_data; g_object_connect (web_view, "signal::notify::uri", - G_CALLBACK(create_web_view_js2_cb), NULL); + G_CALLBACK(create_web_view_js2_cb), NULL, NULL); return TRUE; } |