debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove legacy webkit bug workaround

Browse source
This commit is contained in:
Alexander Butenko 2011-06-06 12:50:28 -04:00 committed by Christian Dywan
parent f46f3f0be0
commit c71f3b37e4
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
extensions/adblock.c
View file

@ -950,7 +950,6 @@ adblock_load_finished_cb (WebKitWebView *web_view,
WebKitWebFrame *web_frame, WebKitWebFrame *web_frame,
gpointer user_data) gpointer user_data)
{ {
JSContextRef js_context = webkit_web_frame_get_global_context (web_frame);
GList* uris = g_object_get_data (G_OBJECT (web_view), "blocked-uris"); GList* uris = g_object_get_data (G_OBJECT (web_view), "blocked-uris");
gchar* script; gchar* script;
GList* li; GList* li;
@ -960,7 +959,6 @@ adblock_load_finished_cb (WebKitWebView *web_view,
script = adblock_prepare_urihider_js (uris); script = adblock_prepare_urihider_js (uris);
webkit_web_view_execute_script (web_view, script); webkit_web_view_execute_script (web_view, script);
sokoke_js_script_eval (js_context, script, NULL);
li = NULL; li = NULL;
for (li = uris; li != NULL; li = g_list_next (li)) for (li = uris; li != NULL; li = g_list_next (li))
uris = g_list_remove (uris, li->data); uris = g_list_remove (uris, li->data);
@ -975,7 +973,7 @@ adblock_window_object_cleared_cb (WebKitWebView* web_view,
JSContextRef js_context, JSContextRef js_context,
JSObjectRef js_window) JSObjectRef js_window)
{ {
webkit_web_view_execute_script (web_view, blockscript); g_free (sokoke_js_script_eval (js_context, blockscript, NULL));
} }
static void static void