[epiphany-extensions] adblock: adblock-patterns is case-insensitive

[Gustavo Noronha Silva <gns src gnome org>]

commit ff90315c15dc7e2711a36db10ed296bae7b4fbaf
Author: Matthew Draper <matthew trebex net>
Date:   Sun Feb 21 14:46:02 2010 +1030

    adblock: adblock-patterns is case-insensitive
    
    Treating it as such obviates the need for recent changes to the patterns
    file itself, so undo those too.
    
    Bug #599562

 extensions/adblock/adblock-pattern.c |    2 +-
 extensions/adblock/adblock-patterns  |    3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)
---
diff --git a/extensions/adblock/adblock-pattern.c b/extensions/adblock/adblock-pattern.c
index ffba122..5630153 100644
--- a/extensions/adblock/adblock-pattern.c
+++ b/extensions/adblock/adblock-pattern.c
@@ -71,7 +71,7 @@ adblock_pattern_load_from_file (GHashTable *patterns,
 
 		if (*line == '\0') continue; /* empty line */
 
-		regex = g_regex_new (line, G_REGEX_OPTIMIZE, 0, &error);
+		regex = g_regex_new (line, G_REGEX_CASELESS | G_REGEX_OPTIMIZE, 0, &error);
 
 		if (regex == NULL)
 		{
diff --git a/extensions/adblock/adblock-patterns b/extensions/adblock/adblock-patterns
index a455f55..f9096ec 100644
--- a/extensions/adblock/adblock-patterns
+++ b/extensions/adblock/adblock-patterns
@@ -29,8 +29,7 @@
 [/&](affiliates?|revenue)((.*\d+x)?\d+|\.pl|\.swf|fuel|pilot|/(banner|script)s?/)
 [/.]overture(/|.*?.*=|\w*\.js|\.com)
 [^\w=+]promo(\w*\.js|banner|box)(?!(\.js)?\?)(\W|_|$)
-/ad_default.html
-[^a-z\d=+% ](?!\d{5,})(\w*\d+x\d)?\d*(show)?(\w{3,}%20|alligator|avs|barter|blog|box|central|context|crystal|d?html|exchange|external|forum|front|fuse|gen|get|house|hover|http|i?frame|inline|instant|live|main|mspace|net|partner|php|popin|primary|provider|realtext|redir\W.*\W|rotated?|secure|side|smart|sponsor|story|text|view|web)?_?[^/]ads?(v?(bot|brite|broker|bureau|butler|cent(er|ric)|click|client|content|coun(cil|t(er)?)|creative|cycle|data(id)?|engage|entry|er(tis\w+|t(pro)?|ve?r?)|farm|feelgood|force|form|frame(generator)?|gen|gif|groupid|head|ima?ge?|index|info|js|juggler|layer|legend|link|log|man(ager)?|max|mentor(serve)?|meta\.com|mosaic|net|optimi[sz]er|parser|peeps|pic|po(ol|pup|sition)|proof|q\.nextag|re(dire?c?t?|mote|volver)|rom\.net|rotator|sale|script|search|sdk|sfac|size|so(lution|nar|urce)|stream|space|srv|stat.*\.asp|sys|(tag)?track|trix|type|view|vt|x\.nu|zone))?s?\d*(status)?\d*(?!\.org)[\W_](?!\w+\.(ac\.|edu)|astra|aware|adurl=|block|login|nl/|sears/|.*(
 &sbc|\.(wmv|rm)))
+[^a-z\d=+% ](?!\d{5,})(\w*\d+x\d)?\d*(show)?(\w{3,}%20|alligator|avs|barter|blog|box|central|context|crystal|d?html|exchange|external|forum|front|fuse|gen|get|house|hover|http|i?frame|inline|instant|live|main|mspace|net|partner|php|popin|primary|provider|realtext|redir\W.*\W|rotated?|secure|side|smart|sponsor|story|text|view|web)?_?ads?(v?(bot|brite|broker|bureau|butler|cent(er|ric)|click|client|content|coun(cil|t(er)?)|creative|cycle|data(id)?|engage|entry|er(tis\w+|t(pro)?|ve?r?)|farm|feelgood|force|form|frame(generator)?|gen|gif|groupid|head|ima?ge?|index|info|js|juggler|layer|legend|link|log|man(ager)?|max|mentor(serve)?|meta\.com|mosaic|net|optimi[sz]er|parser|peeps|pic|po(ol|pup|sition)|proof|q\.nextag|re(dire?c?t?|mote|volver)|rom\.net|rotator|sale|script|search|sdk|sfac|size|so(lution|nar|urce)|stream|space|srv|stat.*\.asp|sys|(tag)?track|trix|type|view|vt|x\.nu|zone))?s?\d*(status)?\d*(?!\.org)[\W_](?!\w+\.(ac\.|edu)|astra|aware|adurl=|block|login|nl/|sears/|.*(&sbc
 |\.(wmv|rm)))
 [^a-z\d=+](get|web)?_?spons?(or(ed|s))?_?(links?)?(pots?)?(\W|_|$)(?!.*sigalert)
 [^a-z\d=+]\d*((cible|com|context|double|euro(s4)?|fast|fine|pay-by-|precision|smart|specific|value)_?clicks?|clicks?(2net|adhere|ban\.php|bank\.net|over|sor\.com|tag|thrutraffic|trade|xchange))(\W|$)(?!but)
 [^a-z]banners?[/._-]?(.*(\d+x\d+\.swf|\.f?pl|_hits\.asp\?|redir|siteid=)|\.(cgi|js|php)|ad|affiliate|central|click|connect|count|current|exchange|file|grocery|id|man(age(ment|r)|ia)|newsletter|/_?promo|/rotat|/?script|serve|skyscraper|space\.|swap|tausch|trust)