Process all the frames

This commit is contained in:
Alexander Butenko 2012-01-07 20:55:19 -04:00 committed by Christian Dywan
parent 835f808115
commit 696b377b32

View file

@ -81,7 +81,6 @@ adblock_build_js (const gchar* uri)
while (cnt >= 0) while (cnt >= 0)
{ {
g_string_prepend (subdomain, subdomains[cnt]); g_string_prepend (subdomain, subdomains[cnt]);
/* g_debug ("processing %s", subdomain->str); */
if ((style = g_hash_table_lookup (blockcssprivate, subdomain->str))) if ((style = g_hash_table_lookup (blockcssprivate, subdomain->str)))
{ {
g_string_append (code, style); g_string_append (code, style);
@ -798,11 +797,6 @@ adblock_resource_request_starting_cb (WebKitWebView* web_view,
if (midori_uri_is_blank (page_uri)) if (midori_uri_is_blank (page_uri))
return; 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); req_uri = webkit_network_request_get_uri (request);
if (!midori_uri_is_http (req_uri) if (!midori_uri_is_http (req_uri)
|| g_str_has_suffix (req_uri, "favicon.ico")) || g_str_has_suffix (req_uri, "favicon.ico"))