diff options
author | Xan Lopez <xan@igalia.com> | 2012-10-03 03:38:13 +0800 |
---|---|---|
committer | Xan Lopez <xan@igalia.com> | 2012-10-03 05:21:10 +0800 |
commit | 7b72dcabf03b0d989da6cb42f4b5adccba54aa33 (patch) | |
tree | 5ae72a1ea347823e8a9686711258af4f5b0a045a | |
parent | 530ef74c3ca2b8fcb3b54947cc111397b943b417 (diff) | |
download | gsoc2013-epiphany-7b72dcabf03b0d989da6cb42f4b5adccba54aa33.tar.gz gsoc2013-epiphany-7b72dcabf03b0d989da6cb42f4b5adccba54aa33.tar.zst gsoc2013-epiphany-7b72dcabf03b0d989da6cb42f4b5adccba54aa33.zip |
adblock: we don't use the edit rules stuff anymore, remove it
https://bugzilla.gnome.org/show_bug.cgi?id=681657
-rw-r--r-- | embed/ephy-adblock-extension.c | 8 | ||||
-rw-r--r-- | embed/ephy-adblock-manager.c | 23 | ||||
-rw-r--r-- | embed/ephy-adblock-manager.h | 3 | ||||
-rw-r--r-- | embed/ephy-adblock.c | 12 | ||||
-rw-r--r-- | embed/ephy-adblock.h | 8 |
5 files changed, 0 insertions, 54 deletions
diff --git a/embed/ephy-adblock-extension.c b/embed/ephy-adblock-extension.c index 9e7bf5e94..c51aa4f52 100644 --- a/embed/ephy-adblock-extension.c +++ b/embed/ephy-adblock-extension.c @@ -113,15 +113,7 @@ ephy_adblock_impl_should_load (EphyAdBlock *blocker, } static void -ephy_adblock_impl_edit_rule (EphyAdBlock *blocker, - const char *url, - gboolean allowed) -{ -} - -static void ephy_adblock_adblock_iface_init (EphyAdBlockIface *iface) { iface->should_load = ephy_adblock_impl_should_load; - iface->edit_rule = ephy_adblock_impl_edit_rule; } diff --git a/embed/ephy-adblock-manager.c b/embed/ephy-adblock-manager.c index 19a5ae454..ed0116b31 100644 --- a/embed/ephy-adblock-manager.c +++ b/embed/ephy-adblock-manager.c @@ -111,29 +111,6 @@ ephy_adblock_manager_class_init (EphyAdBlockManagerClass *klass) } /** - * ephy_adblock_manager_edit_rule: - * @shell: a #EphyAdBlockManager - * @url: the target url on which the rule is based - * @allowed: TRUE if the url has to be blocked. - * - * Ask to the blocker a new rule based on @url. - * - **/ -void -ephy_adblock_manager_edit_rule (EphyAdBlockManager *self, - const char *url, - gboolean allowed) -{ - g_return_if_fail (EPHY_IS_ADBLOCK_MANAGER (self)); - g_return_if_fail (url); - - if (self->priv->blocker != NULL) - ephy_adblock_edit_rule (self->priv->blocker, - url, - allowed); -} - -/** * ephy_adblock_manager_has_blocker: * @shell: a #EphyAdBlockManager * diff --git a/embed/ephy-adblock-manager.h b/embed/ephy-adblock-manager.h index 08c120682..5b11d02db 100644 --- a/embed/ephy-adblock-manager.h +++ b/embed/ephy-adblock-manager.h @@ -65,9 +65,6 @@ gboolean ephy_adblock_manager_should_load (EphyAdBlockManager *self, AdUriCheckType check_type); void ephy_adblock_manager_set_blocker (EphyAdBlockManager *self, EphyAdBlock *blocker); -void ephy_adblock_manager_edit_rule (EphyAdBlockManager *self, - const char *url, - gboolean allowed); gboolean ephy_adblock_manager_has_blocker (EphyAdBlockManager *self); G_END_DECLS diff --git a/embed/ephy-adblock.c b/embed/ephy-adblock.c index dcebc9818..78aadbf3e 100644 --- a/embed/ephy-adblock.c +++ b/embed/ephy-adblock.c @@ -60,15 +60,3 @@ ephy_adblock_should_load (EphyAdBlock *adblock, return TRUE; } - -void -ephy_adblock_edit_rule (EphyAdBlock *adblock, - const char *url, - gboolean allowed) -{ - EphyAdBlockIface *iface = EPHY_ADBLOCK_GET_IFACE (adblock); - if (iface->edit_rule) - { - iface->edit_rule (adblock, url, allowed); - } -} diff --git a/embed/ephy-adblock.h b/embed/ephy-adblock.h index 50d6b0303..6e386d6e7 100644 --- a/embed/ephy-adblock.h +++ b/embed/ephy-adblock.h @@ -79,10 +79,6 @@ struct _EphyAdBlockIface EphyEmbed *embed, const char *url, AdUriCheckType check_type); - - void (* edit_rule) (EphyAdBlock *adblock, - const char *url, - gboolean allowed); }; GType ephy_adblock_get_type (void); @@ -92,10 +88,6 @@ gboolean ephy_adblock_should_load (EphyAdBlock *adblock, const char *url, AdUriCheckType check_type); -void ephy_adblock_edit_rule (EphyAdBlock *adblock, - const char *url, - gboolean allowed); - G_END_DECLS #endif |