Move ephy-adblock.* to embed. Change the API to pass EphyEmbed to

2007-03-03  Benjamin Berg  <benjamin@sipsolutions.net>

	* embed/Makefile.am:
	* embed/ephy-adblock-manager.c: (ephy_adblock_manager_should_load):
	* embed/ephy-adblock-manager.h:
	* embed/ephy-adblock.c: (ephy_adblock_should_load):
	* embed/ephy-adblock.h:
	* embed/mozilla/EphyContentPolicy.cpp:
	* lib/Makefile.am:
	* lib/ephy-adblock.c:
	* lib/ephy-adblock.h:

	Move ephy-adblock.* to embed. Change the API to pass EphyEmbed to
	should_load. This is needed to fix bug #348331.

svn path=/trunk/; revision=6931

3 files changed, 0 insertions, 163 deletions

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 90841f14a..b1e644ab6 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -30,13 +30,11 @@ NOINST_H_FILES = \
 	ephy-zoom.h
 
 TYPES_H_FILES = \
-	ephy-adblock.h				\
 	ephy-node.h				\
 	ephy-password-dialog.h			\
 	ephy-state.h
 
 INST_H_FILES = \
-	ephy-adblock.h				\
 	ephy-dialog.h				\
 	ephy-loader.h				\
 	ephy-node.h				\
@@ -45,7 +43,6 @@ INST_H_FILES = \
 
 libephymisc_la_SOURCES = \
 	eel-gconf-extensions.c			\
-	ephy-adblock.c				\
 	ephy-debug.c				\
 	ephy-dialog.c				\
 	ephy-dnd.c				\
diff --git a/lib/ephy-adblock.c b/lib/ephy-adblock.c
deleted file mode 100644
index 77e51ba1f..000000000
--- a/lib/ephy-adblock.c
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- *  Copyright © 2003 Marco Pesenti Gritti
- *  Copyright © 2003 Christian Persch
- *  Copyright © 2005 Jean-François Rameau
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- *  $Id$
- */
-
-#include "config.h"
-
-#include "ephy-adblock.h"
-
-GType
-ephy_adblock_get_type (void)
-{
-	static GType type = 0;
-
-	if (G_UNLIKELY (type == 0))
-	{
-		const GTypeInfo our_info =
-		{
-			sizeof (EphyAdBlockIface),
-			NULL,
-			NULL,
-		};
-	
-		type = g_type_register_static (G_TYPE_INTERFACE,
-					       "EphyAdBlock",
-					       &our_info, 0);
-	}
-
-	return type;
-}
-
-gboolean
-ephy_adblock_should_load (EphyAdBlock *adblock,
-			  const char *url,
-			  AdUriCheckType check_type)
-{
-	EphyAdBlockIface *iface = EPHY_ADBLOCK_GET_IFACE (adblock);
-	if (iface->should_load)
-	{
-		return iface->should_load (adblock, url, check_type);
-	}
-
-	return TRUE;
-}
-
-void
-ephy_adblock_edit_rule (EphyAdBlock *adblock,
-			const char *url,
-			gboolean allowed)
-{
-	EphyAdBlockIface *iface = EPHY_ADBLOCK_GET_IFACE (adblock);
-	if (iface->edit_rule)
-	{
-		iface->edit_rule (adblock, url, allowed);
-	}
-}
diff --git a/lib/ephy-adblock.h b/lib/ephy-adblock.h
deleted file mode 100644
index cc0dfa91e..000000000
--- a/lib/ephy-adblock.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- *  Copyright © 2003 Marco Pesenti Gritti
- *  Copyright © 2003 Christian Persch
- *  Copyright © 2005 Jean-François Rameau
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- *  $Id$
- */
-
-#ifndef EPHY_ADBLOCK_H
-#define EPHY_ADBLOCK_H
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-#define EPHY_TYPE_ADBLOCK		(ephy_adblock_get_type ())
-#define EPHY_ADBLOCK(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), EPHY_TYPE_ADBLOCK, EphyAdBlock))
-#define EPHY_ADBLOCK_IFACE(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass), EPHY_TYPE_ADBLOCK, EphyAdBlockIface))
-#define EPHY_IS_ADBLOCK(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), EPHY_TYPE_ADBLOCK))
-#define EPHY_IS_ADBLOCK_IFACE(class)	(G_TYPE_CHECK_CLASS_TYPE ((class), EPHY_TYPE_ADBLOCK))
-#define EPHY_ADBLOCK_GET_IFACE(inst)	(G_TYPE_INSTANCE_GET_INTERFACE ((inst), EPHY_TYPE_ADBLOCK, EphyAdBlockIface))
-
-typedef enum
-{
-        AD_URI_CHECK_TYPE_OTHER       = 1U,
-        AD_URI_CHECK_TYPE_SCRIPT      = 2U, /* Indicates an executable script
-					       (such as JavaScript) */
-        AD_URI_CHECK_TYPE_IMAGE       = 3U, /* Indicates an image (e.g., IMG
-					       elements) */
-        AD_URI_CHECK_TYPE_STYLESHEET  = 4U, /* Indicates a stylesheet (e.g.,
-					       STYLE elements) */
-        AD_URI_CHECK_TYPE_OBJECT      = 5U, /* Indicates a generic object
-					       (plugin-handled content
-					       typically falls under this
-					       category) */
-        AD_URI_CHECK_TYPE_DOCUMENT    = 6U, /* Indicates a document at the
-					       top-level (i.e., in a
-					       browser) */
-	AD_URI_CHECK_TYPE_SUBDOCUMENT = 7U, /* Indicates a document contained
-					       within another document (e.g.,
-					       IFRAMEs, FRAMES, and OBJECTs) */
-        AD_URI_CHECK_TYPE_REFRESH     = 8U  /* Indicates a timed refresh */
-} AdUriCheckType;
-
-typedef struct _EphyAdBlock		EphyAdBlock;
-typedef struct _EphyAdBlockIface	EphyAdBlockIface;
-	
-struct _EphyAdBlockIface
-{
-	GTypeInterface base_iface;
-
-	gboolean	(* should_load)	(EphyAdBlock *adblock,
-				         const char *url,
-				         AdUriCheckType check_type);
-	
-	void		(* edit_rule)	(EphyAdBlock *adblock,
-				         const char *url,
-				         gboolean allowed);
-};
-
-GType		ephy_adblock_get_type		(void);
-
-gboolean	ephy_adblock_should_load 	(EphyAdBlock *adblock,
-				    	 	 const char *url,
-				    	 	 AdUriCheckType check_type);
-
-void		ephy_adblock_edit_rule	 	(EphyAdBlock *adblock,
-				    	 	 const char *url,
-				    	 	 gboolean allowed);
-
-G_END_DECLS
-
-#endif