[Xfce4-commits] <midori:master> Remove legacy webkit bug workaround

[Christian Dywan]

Updating branch refs/heads/master
         to c71f3b37e4f6c6828e50f489adf426764fb334f5 (commit)
       from f46f3f0be0ab648fde87dc4a737e8047a74b3a81 (commit)

commit c71f3b37e4f6c6828e50f489adf426764fb334f5
Author: Alexander Butenko <a.butenka at gmail.com>
Date:   Mon Jun 6 12:50:28 2011 -0400

    Remove legacy webkit bug workaround

 extensions/adblock.c |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/extensions/adblock.c b/extensions/adblock.c
index f271df2..e90c0c4 100644
--- a/extensions/adblock.c
+++ b/extensions/adblock.c
@@ -950,7 +950,6 @@ adblock_load_finished_cb (WebKitWebView  *web_view,
                           WebKitWebFrame *web_frame,
                           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");
     gchar* script;
     GList* li;
@@ -960,7 +959,6 @@ adblock_load_finished_cb (WebKitWebView  *web_view,
 
     script = adblock_prepare_urihider_js (uris);
     webkit_web_view_execute_script (web_view, script);
-    sokoke_js_script_eval (js_context, script, NULL);
     li = NULL;
     for (li = uris; li != NULL; li = g_list_next (li))
         uris = g_list_remove (uris, li->data);
@@ -975,7 +973,7 @@ adblock_window_object_cleared_cb (WebKitWebView*  web_view,
                                   JSContextRef    js_context,
                                   JSObjectRef     js_window)
 {
-    webkit_web_view_execute_script (web_view, blockscript);
+    g_free (sokoke_js_script_eval (js_context, blockscript, NULL));
 }
 
 static void