[Xfce4-commits] <midori:master> Process all the frames

[Christian Dywan]

Updating branch refs/heads/master
         to 696b377b32263f6e0e7f04f5f9d9221e5cfceef2 (commit)
       from 835f808115ef961e4008e7f9e6a8f31e540b7f6c (commit)

commit 696b377b32263f6e0e7f04f5f9d9221e5cfceef2
Author: Alexander Butenko <a.butenka at gmail.com>
Date:   Sat Jan 7 20:55:19 2012 -0400

    Process all the frames

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

diff --git a/extensions/adblock.c b/extensions/adblock.c
index ed788e8..4bfd0d8 100644
--- a/extensions/adblock.c
+++ b/extensions/adblock.c
@@ -81,7 +81,6 @@ adblock_build_js (const gchar* uri)
     while (cnt >= 0)
     {
         g_string_prepend (subdomain, subdomains[cnt]);
-        /* g_debug ("processing %s", subdomain->str); */
         if ((style = g_hash_table_lookup (blockcssprivate, subdomain->str)))
         {
             g_string_append (code, style);
@@ -798,11 +797,6 @@ adblock_resource_request_starting_cb (WebKitWebView*         web_view,
     if (midori_uri_is_blank (page_uri))
         return;
 
-    /* Never filter the main page itself */
-    if (web_frame == webkit_web_view_get_main_frame (web_view)
-     && webkit_web_frame_get_load_status (web_frame) == WEBKIT_LOAD_PROVISIONAL)
-        return;
-
     req_uri = webkit_network_request_get_uri (request);
     if (!midori_uri_is_http (req_uri)
      || g_str_has_suffix (req_uri, "favicon.ico"))