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 /embed/ephy-embed.c | |
| 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 'embed/ephy-embed.c')
| -rw-r--r-- | embed/ephy-embed.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/embed/ephy-embed.c b/embed/ephy-embed.c index 0fdf921fb..e805e077c 100644 --- a/embed/ephy-embed.c +++ b/embed/ephy-embed.c @@ -26,7 +26,9 @@ #include "config.h" #include "ephy-embed.h" +#ifndef HAVE_WEBKIT2 #include "ephy-adblock-manager.h" +#endif #include "ephy-debug.h" #include "ephy-download.h" #include "ephy-embed-prefs.h" @@ -105,7 +107,9 @@ struct _EphyEmbedPrivate gulong status_handler_id; gulong progress_update_handler_id; +#ifndef HAVE_WEBKIT2 gulong adblock_handler_id; +#endif }; enum @@ -425,10 +429,12 @@ ephy_embed_dispose (GObject *object) priv->fullscreen_message_id = 0; } +#ifndef HAVE_WEBKIT2 if (priv->adblock_handler_id) { g_signal_handler_disconnect (priv->web_view, priv->adblock_handler_id); priv->adblock_handler_id = 0; } +#endif g_clear_object (&priv->delayed_request); |