diff options
Diffstat (limited to 'src/callbacks.c')
| -rw-r--r-- | src/callbacks.c | 31 |
1 files changed, 8 insertions, 23 deletions
diff --git a/src/callbacks.c b/src/callbacks.c index 803428d..f09dd0d 100644 --- a/src/callbacks.c +++ b/src/callbacks.c @@ -411,6 +411,7 @@ title_change_cb (WebKitWebView* web_view, GParamSpec param_spec) { uzbl.gui.main_title = title ? g_strdup (title) : g_strdup ("(no title)"); update_title(); send_event(TITLE_CHANGED, uzbl.gui.main_title, NULL); + g_setenv("UZBL_TITLE", uzbl.gui.main_title, TRUE); } void @@ -436,6 +437,7 @@ load_status_change_cb (WebKitWebView* web_view, GParamSpec param_spec) { g_free (uzbl.state.uri); GString* newuri = g_string_new (webkit_web_frame_get_uri (frame)); uzbl.state.uri = g_string_free (newuri, FALSE); + g_setenv("UZBL_URI", uzbl.state.uri, TRUE); send_event(LOAD_COMMIT, webkit_web_frame_get_uri (frame), NULL); break; @@ -743,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 |