From e4884cdab61ed2ddc0c69b51175d41f11cc1ded6 Mon Sep 17 00:00:00 2001 From: Carlos Garcia Campos Date: Wed, 6 Mar 2013 17:57:17 +0100 Subject: Do not build adblock files in libephyembed for WebKit2 The required files will be built in the web extension. --- src/ephy-shell.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/ephy-shell.c') diff --git a/src/ephy-shell.c b/src/ephy-shell.c index 3f39fe67a..3d8fc523f 100644 --- a/src/ephy-shell.c +++ b/src/ephy-shell.c @@ -23,7 +23,9 @@ #include "config.h" #include "ephy-shell.h" +#ifndef HAVE_WEBKIT2 #include "ephy-adblock-manager.h" +#endif #include "ephy-bookmarks-editor.h" #include "ephy-bookmarks-import.h" #include "ephy-debug.h" @@ -477,9 +479,11 @@ ephy_shell_constructed (GObject *object) /* FIXME: not sure if this is the best place to put this stuff. */ ephy_shell_get_lockdown (EPHY_SHELL (object)); - + +#ifndef HAVE_WEBKIT2 if (ephy_embed_shell_get_mode (EPHY_EMBED_SHELL (object)) != EPHY_EMBED_SHELL_MODE_TEST) ephy_embed_shell_get_adblock_manager (EPHY_EMBED_SHELL (object)); +#endif if (G_OBJECT_CLASS (ephy_shell_parent_class)->constructed) G_OBJECT_CLASS (ephy_shell_parent_class)->constructed (object); -- cgit v1.2.3