From 9aafaf26f91d8b974dcbd61fefd4e48ebb95b198 Mon Sep 17 00:00:00 2001
From: mdew <mdew@mdew-desktop>
Date: Fri, 18 Dec 2009 01:57:43 +1300
Subject: [PATCH] main - more optimising v10

---
 fanboy-adblocklist-stats.txt                  |  2 ++
 iron/adblock-beta.ini                         |  4 ++--
 opera/urlfilter.ini                           |  4 ++--
 trunk/fanboy-adblocklist-current-expanded.txt | 19 +++++++++----------
 4 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/fanboy-adblocklist-stats.txt b/fanboy-adblocklist-stats.txt
index b7e8042bd..415a8b796 100644
--- a/fanboy-adblocklist-stats.txt
+++ b/fanboy-adblocklist-stats.txt
@@ -84,12 +84,14 @@
 .com/v.gif?
 .com/vanity/?
 .com/w.gif?
+.conversionruler.
 .compteur.com/cpt
 .confirmit.com^$third-party
 .contenture.com^$third-party
 .counter.gd/
 .counter.hackers.lv/
 .countergif
+.copacast.net
 .creditcards.com/sb.php?
 .cxri.net/cgi-bin/
 .cya1t.net/$third-party
diff --git a/iron/adblock-beta.ini b/iron/adblock-beta.ini
index 95c0ca8dc..3b2a42c15 100644
--- a/iron/adblock-beta.ini
+++ b/iron/adblock-beta.ini
@@ -1093,11 +1093,9 @@ _webbanner_
 .com/openx/
 .com/publicidad_
 .com/reklama/
-.conversionruler.
 .canoeklix.com/
 .connexplace.com/
 .contaxe.com/
-.copacast.net/
 .contextweb.
 .cpuim.com/
 .checkm8.com/
@@ -1984,6 +1982,7 @@ _google_ad.
 .cnn/tracking.
 .com/tracking.htm?
 .com/vanity/?
+.conversionruler.
 .confirmit.
 .contenture.
 .cn/stat.js
@@ -1991,6 +1990,7 @@ _google_ad.
 .cnxweb.com/
 .countomat.com/
 .countergif
+.copacast.net/
 .cpcmanager.
 .creditcards.com/sb.php?
 .criteo.com/dis/
diff --git a/opera/urlfilter.ini b/opera/urlfilter.ini
index 2592fc2f3..1a6e66f30 100644
--- a/opera/urlfilter.ini
+++ b/opera/urlfilter.ini
@@ -1118,11 +1118,9 @@ http://*net.nuggad.net/*
 *.com/openx/*
 *.com/publicidad_*
 *.com/reklama/*
-*.conversionruler.*
 *.canoeklix.com/*
 *.connexplace.com/*
 *.contaxe.com/*
-*.copacast.net/*
 *.contextweb.*
 *.cpuim.com/*
 *.checkm8.com/*
@@ -1999,6 +1997,7 @@ http://pagead2.*/pagead/ads?client*http*
 *.com/tracking.htm?*
 *.com/traffic/?*
 *.com/vanity/?*
+*.conversionruler.*
 *.confirmit.*
 *.contenture.*
 *.cn/stat.js
@@ -2006,6 +2005,7 @@ http://pagead2.*/pagead/ads?client*http*
 *.cnxweb.com/*
 *.countomat.com/*
 *.countergif
+*.copacast.net/*
 *.cpcmanager.com/*
 *.criteo.com/dis/*
 *.criteo.com/pac/*
diff --git a/trunk/fanboy-adblocklist-current-expanded.txt b/trunk/fanboy-adblocklist-current-expanded.txt
index bfc0576c2..d7d057468 100644
--- a/trunk/fanboy-adblocklist-current-expanded.txt
+++ b/trunk/fanboy-adblocklist-current-expanded.txt
@@ -237,7 +237,7 @@
 /adfetch
 /adfolder/*
 /adforums/*
-/adisfy.com/*
+||adisfy.com^$third-party
 /ads.dll/*
 ||ad.linksynergy.com^$third-party
 /adman/www/*
@@ -401,7 +401,7 @@
 /emailads/*
 /eshopoffer.asp
 /event.ng/Type
-||eyoob.com/elayer/
+||eyoob.com/elayer/$third-party
 /ewtrack.gif?
 /exp_Proxy.js
 ||fasttracktech.biz^$third-party
@@ -417,7 +417,7 @@
 /foresee-
 /frame_ads_
 /forums/ad/*
-/geoday.ru/*
+||geoday.ru^$third-party
 /get_banner.asp?
 /getad.aspx?
 /getsad.php?
@@ -692,7 +692,8 @@
 /webads/*
 /web_ads/*
 /webMailAd
-||web-adservice.com://nsads.*
+||web-adservice.com
+//nsads.
 |http://oasis.*^$third-party
 ||worthplaying.com/ad_
 /wpAds/iframe.php?
@@ -1108,12 +1109,10 @@ _webbanner_
 .com/openx/
 .com/publicidad_
 .com/reklama/
-.conversionruler.*
-*.canoeklix.com/*
-*.connexplace.com/*
-*.contaxe.com/*
-*.copacast.net/*
-*.contextweb.*
+||canoeklix.com^
+||connexplace.com^$third-party
+||contaxe.com^$third-party
+||contextweb.com^$third-party
 *.cpuim.com/*
 *.checkm8.com/*
 *.checkoutfree.*