diff options
author | Xan Lopez <xan@igalia.com> | 2012-10-03 04:00:09 +0800 |
---|---|---|
committer | Xan Lopez <xan@igalia.com> | 2012-10-03 05:21:15 +0800 |
commit | 9c54a252230ceaf38a3accd5504b3e4bd5959c48 (patch) | |
tree | 6a8c33d4e4e322c2352f71974bf488359c6fc7f7 /embed/ephy-adblock-extension.c | |
parent | 7b72dcabf03b0d989da6cb42f4b5adccba54aa33 (diff) | |
download | gsoc2013-epiphany-9c54a252230ceaf38a3accd5504b3e4bd5959c48.tar gsoc2013-epiphany-9c54a252230ceaf38a3accd5504b3e4bd5959c48.tar.gz gsoc2013-epiphany-9c54a252230ceaf38a3accd5504b3e4bd5959c48.tar.bz2 gsoc2013-epiphany-9c54a252230ceaf38a3accd5504b3e4bd5959c48.tar.lz gsoc2013-epiphany-9c54a252230ceaf38a3accd5504b3e4bd5959c48.tar.xz gsoc2013-epiphany-9c54a252230ceaf38a3accd5504b3e4bd5959c48.tar.zst gsoc2013-epiphany-9c54a252230ceaf38a3accd5504b3e4bd5959c48.zip |
adblock: get rid of AdBlock interface
No need for this now, just make EphyAdBlock a concrete class
implementing the adblock functionality.
https://bugzilla.gnome.org/show_bug.cgi?id=681657
Diffstat (limited to 'embed/ephy-adblock-extension.c')
-rw-r--r-- | embed/ephy-adblock-extension.c | 119 |
1 files changed, 0 insertions, 119 deletions
diff --git a/embed/ephy-adblock-extension.c b/embed/ephy-adblock-extension.c deleted file mode 100644 index c51aa4f52..000000000 --- a/embed/ephy-adblock-extension.c +++ /dev/null @@ -1,119 +0,0 @@ -/* - * Copyright © 2011 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-extension.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_EXTENSION_GET_PRIVATE(object) (G_TYPE_INSTANCE_GET_PRIVATE ((object), EPHY_TYPE_ADBLOCK_EXTENSION, EphyAdblockExtensionPrivate)) - -struct EphyAdblockExtensionPrivate -{ - UriTester *tester; -}; - -static void ephy_adblock_adblock_iface_init (EphyAdBlockIface *iface); - -G_DEFINE_TYPE_WITH_CODE (EphyAdblockExtension, - ephy_adblock_extension, - G_TYPE_OBJECT, - G_IMPLEMENT_INTERFACE (EPHY_TYPE_ADBLOCK, - ephy_adblock_adblock_iface_init)) - -/* Private functions. */ - -static void -ephy_adblock_extension_init (EphyAdblockExtension *extension) -{ - LOG ("EphyAdblockExtension initialising"); - - extension->priv = EPHY_ADBLOCK_EXTENSION_GET_PRIVATE (extension); - extension->priv->tester = uri_tester_new (); -} - -static void -ephy_adblock_extension_dispose (GObject *object) -{ - EphyAdblockExtension *extension = NULL; - - LOG ("EphyAdblockExtension disposing"); - - extension = EPHY_ADBLOCK_EXTENSION (object); - g_clear_object (&extension->priv->tester); - - G_OBJECT_CLASS (ephy_adblock_extension_parent_class)->dispose (object); -} - -static void -ephy_adblock_extension_finalize (GObject *object) -{ - LOG ("EphyAdblockExtension finalising"); - - G_OBJECT_CLASS (ephy_adblock_extension_parent_class)->finalize (object); -} - -static void -ephy_adblock_extension_class_init (EphyAdblockExtensionClass *klass) -{ - GObjectClass *object_class = G_OBJECT_CLASS (klass); - - object_class->dispose = ephy_adblock_extension_dispose; - object_class->finalize = ephy_adblock_extension_finalize; - - g_type_class_add_private (object_class, sizeof (EphyAdblockExtensionPrivate)); -} - -static gboolean -ephy_adblock_impl_should_load (EphyAdBlock *blocker, - EphyEmbed *embed, - const char *url, - AdUriCheckType type) -{ - EphyAdblockExtension *self = NULL; - EphyWebView* web_view = NULL; - const char *address = NULL; - - LOG ("ephy_adblock_impl_should_load checking %s", url); - - self = EPHY_ADBLOCK_EXTENSION (blocker); - g_return_val_if_fail (self != NULL, TRUE); - - web_view = ephy_embed_get_web_view (embed); - address = ephy_web_view_get_address (web_view); - - return !uri_tester_test_uri (self->priv->tester, url, address, type); -} - -static void -ephy_adblock_adblock_iface_init (EphyAdBlockIface *iface) -{ - iface->should_load = ephy_adblock_impl_should_load; -} |