From: Quentin Rameau <quinq@fifth.space>
Date: Thu, 19 Nov 2015 15:38:58 +0000 (+0100)
Subject: Remove windowobjectcleared(), execute scripts on load finished
X-Git-Url: https://git.danieliu.xyz/?a=commitdiff_plain;h=72905b8bfc0f91cd3b6d0ac845c5cae92f8e35db;p=surf.git

Remove windowobjectcleared(), execute scripts on load finished

The “window-object-cleared” signal is not directly accessible for
specific WebViews now. We'll have to use an Extension or rewrite the
JavaScript running functions.
---

diff --git a/surf.c b/surf.c
index d6d644d..eb57824 100644
--- a/surf.c
+++ b/surf.c
@@ -188,8 +188,6 @@ static void togglestyle(Client *c, const Arg *arg);
 static void updatetitle(Client *c);
 static void updatewinid(Client *c);
 static void usage(void);
-static void windowobjectcleared(GtkWidget *w, WebKitWebFrame *frame,
-                                JSContextRef js, JSObjectRef win, Client *c);
 static void zoom(Client *c, const Arg *arg);
 
 /* configuration, allows nested code to access above variables */
@@ -993,9 +991,6 @@ newview(Client *c, WebKitWebView *rv)
 	g_signal_connect(G_OBJECT(v),
 	                 "decide-policy",
 			 G_CALLBACK(decidepolicy), c);
-	g_signal_connect(G_OBJECT(v),
-	                 "window-object-cleared",
-			 G_CALLBACK(windowobjectcleared), c);
 	g_signal_connect(G_OBJECT(v),
 	                 "load-changed",
 			 G_CALLBACK(loadchanged), c);
@@ -1037,8 +1032,6 @@ showview(WebKitWebView *v, Client *c)
 	gdk_window_set_events(gwin, GDK_ALL_EVENTS_MASK);
 	gdk_window_add_filter(gwin, processx, c);
 
-	runscript(frame);
-
 	/* This might conflict with _zoomto96dpi_. */
 	if (zoomlevel != 1.0)
 		webkit_web_view_set_zoom_level(c->view, zoomlevel);
@@ -1528,13 +1521,6 @@ usage(void)
 	    "[-u useragent] [-z zoomlevel] [uri]\n", basename(argv0));
 }
 
-void
-windowobjectcleared(GtkWidget *w, WebKitWebFrame *frame, JSContextRef js,
-                    JSObjectRef win, Client *c)
-{
-	runscript(frame);
-}
-
 void
 zoom(Client *c, const Arg *arg)
 {