uri-tester: define ad check types here

And get rid of ad-block.[c,h], which we only used for the enum.

3 files changed, 29 insertions, 190 deletions

diff --git a/embed/ephy-adblock.c b/embed/ephy-adblock.c
deleted file mode 100644
index 6b26b7f6f..000000000
--- a/embed/ephy-adblock.c
+++ /dev/null
@@ -1,96 +0,0 @@
-/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/*
- *  Copyright © 2011, 2012 Igalia S.L.
- *
- *  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.
- *
- *  Some parts of this file based on the previous 'adblock' extension,
- *  licensed with the GNU General Public License 2 and later versions,
- *  Copyright (C) 2003 Marco Pesenti Gritti, Christian Persch.
- *
- *  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.
- */
-
-#include "config.h"
-#include "ephy-adblock.h"
-
-#include "ephy-adblock-manager.h"
-#include "ephy-debug.h"
-#include "ephy-embed-shell.h"
-#include "ephy-file-helpers.h"
-#include "uri-tester.h"
-
-#include <glib/gi18n-lib.h>
-#include <gtk/gtk.h>
-
-#define EPHY_ADBLOCK_GET_PRIVATE(object) (G_TYPE_INSTANCE_GET_PRIVATE ((object), EPHY_TYPE_ADBLOCK, EphyAdBlockPrivate))
-
-struct EphyAdBlockPrivate
-{
-  UriTester *tester;
-};
-
-G_DEFINE_TYPE (EphyAdBlock, ephy_adblock, G_TYPE_OBJECT)
-
-/* Private functions. */
-
-static void
-ephy_adblock_init (EphyAdBlock *adblock)
-{
-  LOG ("EphyAdblock initialising");
-
-  adblock->priv = EPHY_ADBLOCK_GET_PRIVATE (adblock);
-  adblock->priv->tester = uri_tester_new (ephy_dot_dir ());
-}
-
-static void
-ephy_adblock_dispose (GObject *object)
-{
-  EphyAdBlock *adblock = NULL;
-
-  LOG ("EphyAdblock disposing");
-
-  adblock = EPHY_ADBLOCK (object);
-  g_clear_object (&adblock->priv->tester);
-
-  G_OBJECT_CLASS (ephy_adblock_parent_class)->dispose (object);
-}
-
-static void
-ephy_adblock_class_init (EphyAdBlockClass *klass)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-  object_class->dispose = ephy_adblock_dispose;
-
-  g_type_class_add_private (object_class, sizeof (EphyAdBlockPrivate));
-}
-
-gboolean
-ephy_adblock_should_load (EphyAdBlock *adblock,
-                          EphyEmbed *embed,
-                          const char *url,
-                          AdUriCheckType type)
-{
-  EphyWebView* web_view = NULL;
-  const char *address = NULL;
-
-  g_return_val_if_fail (adblock != NULL, TRUE);
-  g_return_val_if_fail (embed != NULL, TRUE);
-  g_return_val_if_fail (url, TRUE);
-
-  web_view = ephy_embed_get_web_view (embed);
-  address = ephy_web_view_get_address (web_view);
-
-  return !uri_tester_test_uri (adblock->priv->tester, url, address, type);
-}
diff --git a/embed/ephy-adblock.h b/embed/ephy-adblock.h
deleted file mode 100644
index efdd5d06f..000000000
--- a/embed/ephy-adblock.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/*
- *  Copyright © 2011, 2012 Igalia S.L.
- *
- *  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.
- */
-
-#ifndef EPHY_ADBLOCK_H
-#define EPHY_ADBLOCK_H
-
-#include "ephy-embed.h"
-
-#include <glib-object.h>
-#include <glib.h>
-
-G_BEGIN_DECLS
-
-#define EPHY_TYPE_ADBLOCK         (ephy_adblock_get_type ())
-#define EPHY_ADBLOCK(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), EPHY_TYPE_ADBLOCK, EphyAdBlock))
-#define EPHY_ADBLOCK_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), EPHY_TYPE_ADBLOCK, EphyAdBlockClass))
-#define EPHY_IS_ADBLOCK(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), EPHY_TYPE_ADBLOCK))
-#define EPHY_IS_ADBLOCK_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_ADBLOCK))
-#define EPHY_ADBLOCK_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), EPHY_TYPE_ADBLOCK, EphyAdBlockClass))
-
-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 */
-  AD_URI_CHECK_TYPE_XBEL              =  9U, /* Indicates an XBL binding request,
-                                                triggered either by -moz-binding CSS
-                                                property or Document.addBinding method */
-  AD_URI_CHECK_TYPE_PING              = 10U, /* Indicates a ping triggered by a click on
-                                                <A PING="..."> element */
-  AD_URI_CHECK_TYPE_XMLHTTPREQUEST    = 11U, /* Indicates a XMLHttpRequest */
-  AD_URI_CHECK_TYPE_OBJECT_SUBREQUEST = 12U  /* Indicates a request by a plugin */
-} AdUriCheckType;
-
-typedef struct EphyAdBlock        EphyAdBlock;
-typedef struct EphyAdBlockClass   EphyAdBlockClass;
-typedef struct EphyAdBlockPrivate EphyAdBlockPrivate;
-
-struct EphyAdBlockClass
-{
-  GObjectClass parent_class;
-};
-
-struct EphyAdBlock
-{
-  GObject parent_instance;
-
-  /*< private >*/
-  EphyAdBlockPrivate *priv;
-};
-
-GType    ephy_adblock_get_type    (void);
-
-gboolean ephy_adblock_should_load (EphyAdBlock   *adblock,
-                                   EphyEmbed     *embed,
-                                   const char    *url,
-                                   AdUriCheckType type);
-
-G_END_DECLS
-
-#endif
diff --git a/embed/uri-tester.h b/embed/uri-tester.h
index 213bd9fec..ebbd964b4 100644
--- a/embed/uri-tester.h
+++ b/embed/uri-tester.h
@@ -19,8 +19,6 @@
 #ifndef URI_TESTER_H
 #define URI_TESTER_H
 
-#include "ephy-adblock.h"
-
 #include <glib-object.h>
 #include <glib.h>
 
@@ -33,6 +31,35 @@ G_BEGIN_DECLS
 #define IS_URI_TESTER_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), TYPE_URI_TESTER))
 #define URI_TESTER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), TYPE_URI_TESTER, UriTesterClass))
 
+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 */
+  AD_URI_CHECK_TYPE_XBEL              =  9U, /* Indicates an XBL binding request,
+                                                triggered either by -moz-binding CSS
+                                                property or Document.addBinding method */
+  AD_URI_CHECK_TYPE_PING              = 10U, /* Indicates a ping triggered by a click on
+                                                <A PING="..."> element */
+  AD_URI_CHECK_TYPE_XMLHTTPREQUEST    = 11U, /* Indicates a XMLHttpRequest */
+  AD_URI_CHECK_TYPE_OBJECT_SUBREQUEST = 12U  /* Indicates a request by a plugin */
+} AdUriCheckType;
+
 typedef struct _UriTester        UriTester;
 typedef struct _UriTesterClass   UriTesterClass;
 typedef struct _UriTesterPrivate UriTesterPrivate;