[epiphany-extensions] Remove adblock extension



commit a80ad802d0d361045f316dc2fe8a1682d1dc81ae
Author: Xan Lopez <xan igalia com>
Date:   Wed Oct 3 11:37:05 2012 +0200

    Remove adblock extension
    
    It's built-in in Epiphany starting in 3.7.x

 README                                          |    1 -
 configure.ac                                    |    9 +-
 extensions/adblock/Makefile.am                  |   47 --
 extensions/adblock/adblock-ui.c                 |  387 ----------
 extensions/adblock/adblock-ui.h                 |   62 --
 extensions/adblock/adblock.ephy-extension.in.in |   10 -
 extensions/adblock/adblock.ui                   |  198 -----
 extensions/adblock/ephy-adblock-extension.c     |  317 --------
 extensions/adblock/ephy-adblock-extension.h     |   58 --
 extensions/adblock/extension.c                  |   44 --
 extensions/adblock/uri-tester.c                 |  907 -----------------------
 extensions/adblock/uri-tester.h                 |   71 --
 po/POTFILES.in                                  |    4 -
 13 files changed, 4 insertions(+), 2111 deletions(-)
---
diff --git a/README b/README
index dd88180..7b0a738 100644
--- a/README
+++ b/README
@@ -11,7 +11,6 @@ How to choose which extensions to build:
 where ext1, ext2 ... are one of the following:
 
 actions			Perform actions on links from the context menu
-adblock			Block content based on its URL
 auto-scroll		Auto scroll on middle mouse clicks
 auto-reload		Reload a tab periodically
 bookmarks-tray		Add bookmarks menu to the panel
diff --git a/configure.ac b/configure.ac
index d7599c0..0c371e2 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="certificates 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/po/POTFILES.in b/po/POTFILES.in
index d494050..b084243 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -6,9 +6,6 @@
 extensions/actions/ephy-actions-extension.c
 extensions/actions/ephy-actions-extension-editor-dialog.c
 extensions/actions/ephy-actions-extension-properties-dialog.c
-extensions/adblock/adblock-ui.c
-[type: gettext/glade]extensions/adblock/adblock.ui
-extensions/adblock/ephy-adblock-extension.c
 extensions/auto-reload/ephy-auto-reload-extension.c
 extensions/certificates/ephy-certificates-extension.c
 extensions/error-viewer/ephy-error-viewer-extension.c
@@ -39,7 +36,6 @@ extensions/smart-bookmarks/smart-bookmarks-extension.c
 extensions/soup-fly/ephy-soup-fly-extension.c
 extensions/soup-fly/soup-fly.c
 [type: gettext/ini]extensions/actions/actions.ephy-extension.in.in
-[type: gettext/ini]extensions/adblock/adblock.ephy-extension.in.in
 [type: gettext/ini]extensions/auto-scroller/auto-scroller.ephy-extension.in.in
 [type: gettext/ini]extensions/auto-reload/auto-reload.ephy-extension.in.in
 [type: gettext/ini]extensions/certificates/certificates.ephy-extension.in.in



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]