GNOME.org
 

[epiphany-extensions] adblock: Remove the old 'Ad Blocker' extension and its documentation.

commit ff0031cc82cb4247b1a65d3338e6495fff4bf009
Author: Mario Sanchez Prada <msanchez igalia com>
Date:   Sat Dec 3 20:58:50 2011 +0100

    adblock: Remove the old 'Ad Blocker' extension and its documentation.
    
    This is the previous step to provide the patch with the new
    version of the extension, to be named 'Ad Blocker v2'.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=660154

 configure.ac                                    |    9 +-
 extensions/adblock/Makefile.am                  |   57 --
 extensions/adblock/ad-blocker.c                 |  202 -------
 extensions/adblock/ad-blocker.h                 |   79 ---
 extensions/adblock/ad-uri-tester.c              |  221 --------
 extensions/adblock/ad-uri-tester.h              |   67 ---
 extensions/adblock/adblock-pattern.c            |  407 ---------------
 extensions/adblock/adblock-pattern.h            |   55 --
 extensions/adblock/adblock-patterns             |  201 -------
 extensions/adblock/adblock-ui.c                 |  637 -----------------------
 extensions/adblock/adblock-ui.h                 |   68 ---
 extensions/adblock/adblock.ephy-extension.in.in |   11 -
 extensions/adblock/adblock.ui                   |  402 --------------
 extensions/adblock/download-latest.pl           |   68 ---
 extensions/adblock/ephy-adblock-extension.c     |  615 ----------------------
 extensions/adblock/ephy-adblock-extension.h     |   65 ---
 extensions/adblock/extension.c                  |   49 --
 help/C/epiphany-extensions.xml                  |   72 ---
 help/C/figures/epi-ext-adblocker.png            |  Bin 3687 -> 0 bytes
 19 files changed, 4 insertions(+), 3281 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index d764e94..a9f7420 100644
--- a/configure.ac
+++ b/configure.ac
@@ -169,9 +169,9 @@ AM_CONDITIONAL([HAVE_OPENSP],[test "x$enable_opensp" = "xyes"])
 
 AC_MSG_CHECKING([which extensions to build])
 
-ALL_EXTENSIONS="actions adblock auto-reload auto-scroller certificates error-viewer extensions-manager-ui gestures greasemonkey html5tube java-console livehttpheaders page-info permissions push-scroller rss sample select-stylesheet smart-bookmarks soup-fly tab-key-tab-navigate tab-states"
-USEFUL_EXTENSIONS="actions adblock auto-reload auto-scroller certificates extensions-manager-ui html5tube java-console page-info push-scroller select-stylesheet smart-bookmarks soup-fly tab-key-tab-navigate tab-states"
-DEFAULT_EXTENSIONS="actions adblock auto-reload certificates extensions-manager-ui greasemonkey gestures html5tube push-scroller soup-fly tab-key-tab-navigate tab-states rss"
+ALL_EXTENSIONS="actions auto-reload auto-scroller certificates error-viewer extensions-manager-ui gestures greasemonkey html5tube java-console livehttpheaders page-info permissions push-scroller rss sample select-stylesheet smart-bookmarks soup-fly tab-key-tab-navigate tab-states"
+USEFUL_EXTENSIONS="actions auto-reload auto-scroller certificates extensions-manager-ui html5tube java-console page-info push-scroller select-stylesheet smart-bookmarks soup-fly tab-key-tab-navigate tab-states"
+DEFAULT_EXTENSIONS="actions auto-reload certificates extensions-manager-ui greasemonkey gestures html5tube push-scroller soup-fly tab-key-tab-navigate tab-states rss"
 
 MOZILLA_ALL_EXTENSIONS="error-viewer java-console livehttpheaders page-info select-stylesheet smart-bookmarks"
 
@@ -184,7 +184,7 @@ DIST_EXTENSIONS="$ALL_EXTENSIONS"
 AC_ARG_WITH([extensions],
 [  --with-extensions=extension1,extension2,...
 			  build the specified extensions. Available:
-			  actions, adblock, auto-reload, auto-scroller,
+			  actions, auto-reload, auto-scroller,
 			  certificates, error-viewer, extensions-manager-ui,
 			  gestures, greasemonkey, java-console, livehttpheaders, page-info,
 			  permissions, push-scroller, rss, sample,
@@ -275,7 +275,6 @@ data/Makefile
 data/icons/Makefile
 extensions/Makefile
 extensions/actions/Makefile
-extensions/adblock/Makefile
 extensions/auto-reload/Makefile
 extensions/auto-scroller/Makefile
 extensions/certificates/Makefile
diff --git a/help/C/epiphany-extensions.xml b/help/C/epiphany-extensions.xml
index 2f7dec1..80f6176 100644
--- a/help/C/epiphany-extensions.xml
+++ b/help/C/epiphany-extensions.xml
@@ -281,78 +281,6 @@
 
 	</sect1>
 	
-	<sect1 id="epi-ext-adblocker">
-		<title>Ad Blocker</title>
-		
-		<sect2 id="epi-ext-adblocker-intro">
-			<title>Introduction</title>
-			
-			<para>The Ad Blocker extension lets you block ad banners on websites.
-			It avoids downloading them, saving time and bandwidth.</para>
-		</sect2>
-
-		<sect2 id="epi-ext-adblocker-usage">
-			<title>Using Ad Blocker</title>
-			
-			<para>To use the Ad Blocker, you have to enable the extension.
-			The extension will ignore link to ads when you visit websites, and	they won't 
-			be displayed in web pages.</para>
-			<para>&app; will display an icon in left side of the status bar 
-			(see <xref linkend="epi-ext-figure-adblocker"/>) to inform you that it has 
-			blocked ads. If you move the mouse pointer over the icon, it will
-			give you the number of ads blocked in the page.</para>
-			<figure id="epi-ext-figure-adblocker">
-			  <title>The Ad Blocker icon</title>
-                <screenshot>
-                  <mediaobject>
-                    <imageobject>
-                      <imagedata fileref="figures/epi-ext-adblocker.png" format="PNG"/>
-                    </imageobject>
-                  </mediaobject>
-                </screenshot>
-			</figure>
-		</sect2>
-
-		<sect2 id="epi-ext-adblocker-usage-extend">
-				<title>Extend Ad Blocker</title>
-
-				<para>Ad Blocker should block most of the advertisement on the
-				web, but if you find that some banners are not blocked or Ad
-				Blocker is too restrictive, you can	tune Ad Blocker extension to
-				match your needs.
-				</para>
-				<para>Ad Blocker uses Perl regular expressions to match known URLs of
-				ads servers and common words used in URLs of ads. Ad Blocker
-				stores the system-wide rules in the file
-				<filename>adblock-patterns</filename> located in <filename
-				class='directory'>$PREFIX/share/epiphany-extensions/</filename>;
-				one regular	expression per line. 
-				</para>
-
-				<sect3 id="epi-ext-adblocker-usage-extend-blacklist">
-					<title>Add a deny rule</title>
-
-					<para>If you want to block an ad not blocked by the Ad
-					Blocker default rules, you may create a blacklist file, and
-					add rules inside.</para>
-					<para>&app; looks for the blacklist rules in the file 
-					<filename>$HOME/.gnome2/epiphany/extensions/data/adblock/blacklist</filename>.
-					</para>
-				</sect3>
-
-				<sect3 id="epi-ext-adblocker-usage-extend-whitelist">
-					<title>Add a permit rule</title>
-
-					<para>If you want allow to permit an ad to be displayed or
-					correct a rule of Ad Blocker which is too restrictive, you can
-					create a whitelist file, and add rules inside.</para>
-					<para>&app; looks for white-list rules in the file 
-					<filename>$HOME/.gnome2/epiphany/extensions/data/adblock/whitelist</filename>.
-					</para>
-				</sect3>
-		</sect2>
-	</sect1>
-	
 	<sect1 id="epi-ext-autoreloadtab">
 		<title>Auto Reload Tab</title>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]