diff options
| author | Xan Lopez <xan@igalia.com> | 2012-10-03 04:00:09 +0800 |
|---|---|---|
| committer | Xan Lopez <xan@igalia.com> | 2012-10-03 05:21:15 +0800 |
| commit | 9c54a252230ceaf38a3accd5504b3e4bd5959c48 (patch) | |
| tree | 6a8c33d4e4e322c2352f71974bf488359c6fc7f7 /embed/ephy-embed-shell.c | |
| parent | 7b72dcabf03b0d989da6cb42f4b5adccba54aa33 (diff) | |
| download | gsoc2013-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 'embed/ephy-embed-shell.c')
| -rw-r--r-- | embed/ephy-embed-shell.c | 14 |
1 files changed, 11 insertions, 3 deletions
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 |