Merge branch '4.1'

Author: jun7

main.c

@@ -3999,23 +3999,18 @@ static gboolean policycb(
 		webkit_policy_decision_download(dec);
 	return true;
 }
-static GtkWidget *createcb(Win *win)
+static GtkWidget *createcb(WebKitWebView* k,
+		WebKitNavigationAction* na, Win *win)
 {
 	char *handle = getset(win, "newwinhandle");
 
 	if (!g_strcmp0(handle, "notnew"))
-		if (win->link && !g_str_has_prefix(win->link, "javascript:"))
-		{
-			showmsg(win, "Create window is canceled");
-			openuri(win, win->link);
-		}
-		else
-		{
-			Win *new = newwin(NULL, win, win, 0);
-			showmsg(new, "Link URL was not set");
-			return new->kitw;
-		}
-	else if (!g_strcmp0(handle, "ignore")) showmsg(win, "Create window is ignored") ;
+	{
+		openuri(win, webkit_uri_request_get_uri(
+					webkit_navigation_action_get_request(na)));
+		showmsg(win, "Create window is canceled");
+	}
+	else if (!g_strcmp0(handle, "ignore")) showmsg(win, "Create window is ignored");
 	else if (!g_strcmp0(handle, "back"  )) return newwin(NULL, win, win, 1)->kitw;
 	else                       /*normal*/  return newwin(NULL, win, win, 0)->kitw;
 
@@ -4679,7 +4674,7 @@ Win *newwin(const char *uri, Win *cbwin, Win *caller, int back)
 	SIG( o, "scroll-event"         , scrollcb  , win);
 
 	SIG( o, "decide-policy"        , policycb  , win);
-	SIGW(o, "create"               , createcb  , win);
+	SIG( o, "create"               , createcb  , win);
 	SIGW(o, "close"                , gtk_widget_destroy, win->winw);
 	SIGW(o, "script-dialog"        , sdialogcb , win);
 	SIG( o, "load-changed"         , loadcb    , win);