From: Enno Boland (Gottox) <gottox@s01.de>
Date: Sat, 6 Jun 2009 15:26:43 +0000 (+0200)
Subject: opening new windows works now.
X-Git-Url: https://git.danieliu.xyz/?a=commitdiff_plain;h=20c257e90c75a12d2d276fc3fda08a4732efcc5b;p=surf.git

opening new windows works now.
---

diff --git a/surf.c b/surf.c
index b4e77f3..8bf23f2 100644
--- a/surf.c
+++ b/surf.c
@@ -45,7 +45,8 @@ static void progresschange(WebKitWebView *view, gint p, gpointer d);
 static void loadcommit(WebKitWebView *view, WebKitWebFrame *f, gpointer d);
 static void linkhover(WebKitWebView* page, const gchar* t, const gchar* l, gpointer d);
 static void destroyclient(Client *c);
-static gboolean newwindow(WebKitWebView *view, WebKitWebFrame *f,
+WebKitWebView newwindow(WebKitWebView  *v, WebKitWebFrame *f, gpointer d);
+static gboolean decidewindow(WebKitWebView *view, WebKitWebFrame *f,
 		WebKitNetworkRequest *r, WebKitWebNavigationAction *n,
 		WebKitWebPolicyDecision *p, gpointer d);
 static gboolean download(WebKitWebView *view, GObject *o, gpointer d);
@@ -123,16 +124,19 @@ download(WebKitWebView *view, GObject *o, gpointer d) {
 }
 
 gboolean
-newwindow(WebKitWebView *view, WebKitWebFrame *f,
+decidewindow(WebKitWebView *view, WebKitWebFrame *f,
 		WebKitNetworkRequest *r, WebKitWebNavigationAction *n,
 		WebKitWebPolicyDecision *p, gpointer d) {
 	/* TODO */
-	puts("new");
-	Client *c = newclient();
-	webkit_web_view_load_request(c->view, r);
 	return TRUE;
 }
 
+WebKitWebView newwindow(WebKitWebView  *v, WebKitWebFrame *f, gpointer d) {
+	/* TODO */
+	Client *c = newclient();
+	return *c->view;
+}
+
 void
 linkhover(WebKitWebView* page, const gchar* t, const gchar* l, gpointer d) {
 	Client *c = (Client *)d;
@@ -316,7 +320,8 @@ newclient(void) {
 	g_signal_connect(G_OBJECT(c->view), "load-progress-changed", G_CALLBACK(progresschange), c);
 	g_signal_connect(G_OBJECT(c->view), "load-committed", G_CALLBACK(loadcommit), c);
 	g_signal_connect(G_OBJECT(c->view), "hovering-over-link", G_CALLBACK(linkhover), c);
-	g_signal_connect(G_OBJECT(c->view), "new-window-policy-decision-requested", G_CALLBACK(newwindow), c);
+	g_signal_connect(G_OBJECT(c->view), "create-web-view", G_CALLBACK(newwindow), c);
+	g_signal_connect(G_OBJECT(c->view), "new-window-policy-decision-requested", G_CALLBACK(decidewindow), c);
 	g_signal_connect(G_OBJECT(c->view), "download-requested", G_CALLBACK(download), c);
 
 	/* urlbar */