diff options
| author |  Brendan Taylor <whateley@gmail.com> | 2010-12-03 15:15:02 -0700 |
|---|---|---|
| committer | Brendan Taylor <whateley@gmail.com> | 2010-12-03 15:15:02 -0700 |
| commit | e81d25237bd6f95741f3d709d97cfc02ff13c9f4 (patch) | |
| tree | 326bd13b442987e03584aa2bb1cf3667238549c9 /src | |
| parent | de79ee76d7c86d032309d73ba210668466785b42 (diff) | |
| parent | d2a7f3228589c24948adb22922f1ccccaa5996fc (diff) | |
Merge branch 'fix-oiinw' into experimental
Diffstat (limited to 'src')
| -rw-r--r-- | src/callbacks.c | 29 |
1 files changed, 6 insertions, 23 deletions
diff --git a/src/callbacks.c b/src/callbacks.c index bcbac00..f09dd0d 100644 --- a/src/callbacks.c +++ b/src/callbacks.c @@ -745,32 +745,15 @@ create_web_view_cb (WebKitWebView *web_view, WebKitWebFrame *frame, gpointer us (void) web_view; (void) frame; (void) user_data; - if (uzbl.state.selected_url != NULL) { - if (uzbl.state.verbose) - printf("\nNew web view -> %s\n", uzbl.state.selected_url); - if (strncmp(uzbl.state.selected_url, "javascript:", strlen("javascript:")) == 0) { - WebKitWebView* new_view = WEBKIT_WEB_VIEW(webkit_web_view_new()); - - g_signal_connect (new_view, "web-view-ready", - G_CALLBACK(create_web_view_js_cb), NULL); - - return new_view; - } - else - send_event(NEW_WINDOW, uzbl.state.selected_url, NULL); - - } else { - if (uzbl.state.verbose) - printf("New web view -> javascript link...\n"); + if (uzbl.state.verbose) + printf("New web view -> javascript link...\n"); - WebKitWebView* new_view = WEBKIT_WEB_VIEW(webkit_web_view_new()); + WebKitWebView* new_view = WEBKIT_WEB_VIEW(webkit_web_view_new()); - g_signal_connect (new_view, "web-view-ready", - G_CALLBACK(create_web_view_js_cb), NULL); - return new_view; - } - return NULL; + g_signal_connect (new_view, "web-view-ready", + G_CALLBACK(create_web_view_js_cb), NULL); + return new_view; } void |