remove obsolete new_window handler and fix some potential segfault issues

1 files changed, 6 insertions, 2 deletions

diff --git a/src/callbacks.c b/src/callbacks.c
index 145bc19..298b3db 100644
--- a/src/callbacks.c
+++ b/src/callbacks.c
@@ -629,17 +629,22 @@ navigation_decision_cb (WebKitWebView *web_view, WebKitWebFrame *frame, WebKitNe
 }
 
 gboolean
-new_window_cb (WebKitWebView *web_view, WebKitWebFrame *frame, WebKitNetworkRequest *request, WebKitWebNavigationAction *navigation_action, WebKitWebPolicyDecision *policy_decision, gpointer user_data) {
+new_window_cb (WebKitWebView *web_view, WebKitWebFrame *frame,
+        WebKitNetworkRequest *request, WebKitWebNavigationAction *navigation_action,
+        WebKitWebPolicyDecision *policy_decision, gpointer user_data) {
     (void) web_view;
     (void) frame;
     (void) navigation_action;
     (void) policy_decision;
     (void) user_data;
     const gchar* uri = webkit_network_request_get_uri (request);
+
     if (uzbl.state.verbose)
         printf("New window requested -> %s \n", uri);
+
     webkit_web_policy_decision_use(policy_decision);
     send_event(NEW_WINDOW, uri, NULL);
+
     return TRUE;
 }
 
@@ -680,7 +685,6 @@ create_web_view_cb (WebKitWebView  *web_view, WebKitWebFrame *frame, gpointer us
     if (uzbl.state.selected_url != NULL) {
         if (uzbl.state.verbose)
             printf("\nNew web view -> %s\n",uzbl.state.selected_url);
-        new_window_load_uri(uzbl.state.selected_url);
     } else {
         if (uzbl.state.verbose)
             printf("New web view -> %s\n","Nothing to open, exiting");