From 9c54a252230ceaf38a3accd5504b3e4bd5959c48 Mon Sep 17 00:00:00 2001 From: Xan Lopez Date: Tue, 2 Oct 2012 22:00:09 +0200 Subject: 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 --- embed/ephy-embed-shell.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'embed/ephy-embed-shell.c') diff --git a/embed/ephy-embed-shell.c b/embed/ephy-embed-shell.c index 9069f4cc8..501fddca0 100644 --- a/embed/ephy-embed-shell.c +++ b/embed/ephy-embed-shell.c @@ -411,12 +411,20 @@ ephy_embed_shell_get_default (void) GObject * ephy_embed_shell_get_adblock_manager (EphyEmbedShell *shell) { + EphyEmbedShellPrivate *priv; + g_return_val_if_fail (EPHY_IS_EMBED_SHELL (shell), NULL); - if (shell->priv->adblock_manager == NULL) - shell->priv->adblock_manager = g_object_new (EPHY_TYPE_ADBLOCK_MANAGER, NULL); + priv = shell->priv; + + if (priv->adblock_manager == NULL) { + priv->adblock_manager = g_object_new (EPHY_TYPE_ADBLOCK_MANAGER, NULL); + + ephy_adblock_manager_set_blocker (priv->adblock_manager, + g_object_new (EPHY_TYPE_ADBLOCK, NULL)); + } - return G_OBJECT (shell->priv->adblock_manager); + return G_OBJECT (priv->adblock_manager); } void -- cgit v1.2.3