aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorXan Lopez <xan@igalia.com>2012-10-03 04:00:09 +0800
committerXan Lopez <xan@igalia.com>2012-10-03 05:21:15 +0800
commit9c54a252230ceaf38a3accd5504b3e4bd5959c48 (patch)
tree6a8c33d4e4e322c2352f71974bf488359c6fc7f7 /src
parent7b72dcabf03b0d989da6cb42f4b5adccba54aa33 (diff)
downloadgsoc2013-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 'src')
-rw-r--r--src/ephy-shell.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/src/ephy-shell.c b/src/ephy-shell.c
index e88e9a086..7dda80ad3 100644
--- a/src/ephy-shell.c
+++ b/src/ephy-shell.c
@@ -23,7 +23,6 @@
#include "config.h"
#include "ephy-shell.h"
-#include "ephy-adblock-extension.h"
#include "ephy-adblock-manager.h"
#include "ephy-bookmarks-editor.h"
#include "ephy-bookmarks-import.h"
@@ -1057,8 +1056,6 @@ ephy_shell_get_prefs_dialog (EphyShell *shell)
void
_ephy_shell_create_instance (EphyEmbedShellMode mode)
{
- EphyAdBlockManager *adblock_manager;
-
g_assert (ephy_shell == NULL);
ephy_shell = EPHY_SHELL (g_object_new (EPHY_TYPE_SHELL,
@@ -1067,11 +1064,6 @@ _ephy_shell_create_instance (EphyEmbedShellMode mode)
NULL));
/* FIXME weak ref */
g_assert (ephy_shell != NULL);
-
- /* FIXME not the best place to have this */
- adblock_manager = EPHY_ADBLOCK_MANAGER (ephy_embed_shell_get_adblock_manager (embed_shell));
- ephy_adblock_manager_set_blocker (adblock_manager,
- g_object_new (EPHY_TYPE_ADBLOCK_EXTENSION, NULL));
}
/**