diff options
| author | Carlos Garcia Campos <cgarcia@igalia.com> | 2013-03-07 00:57:17 +0800 |
|---|---|---|
| committer | Carlos Garcia Campos <carlosgc@gnome.org> | 2013-03-07 03:16:54 +0800 |
| commit | e4884cdab61ed2ddc0c69b51175d41f11cc1ded6 (patch) | |
| tree | 023ec87c4860a3988b75602fad70d507d90f901e /src | |
| parent | 80ea62552d2e08dc2e990c5820678a06157ae416 (diff) | |
| download | gsoc2013-epiphany-e4884cdab61ed2ddc0c69b51175d41f11cc1ded6.tar gsoc2013-epiphany-e4884cdab61ed2ddc0c69b51175d41f11cc1ded6.tar.gz gsoc2013-epiphany-e4884cdab61ed2ddc0c69b51175d41f11cc1ded6.tar.bz2 gsoc2013-epiphany-e4884cdab61ed2ddc0c69b51175d41f11cc1ded6.tar.lz gsoc2013-epiphany-e4884cdab61ed2ddc0c69b51175d41f11cc1ded6.tar.xz gsoc2013-epiphany-e4884cdab61ed2ddc0c69b51175d41f11cc1ded6.tar.zst gsoc2013-epiphany-e4884cdab61ed2ddc0c69b51175d41f11cc1ded6.zip | |
Do not build adblock files in libephyembed for WebKit2
The required files will be built in the web extension.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ephy-shell.c | 6 |
1 files changed, 5 insertions, 1 deletions
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); |