After an evaluation, GNOME has moved from Bugzilla to GitLab. Learn more about GitLab.
No new issues can be reported in GNOME Bugzilla anymore.
To report an issue in a GNOME project, go to GNOME GitLab.
Do not go to GNOME Gitlab for: Bluefish, Doxygen, GnuCash, GStreamer, java-gnome, LDTP, NetworkManager, Tomboy.
Bug 681657 - Integrate adblock extension
Integrate adblock extension
Status: RESOLVED FIXED
Product: epiphany
Classification: Core
Component: General
3.5.x
Other Linux
: Normal normal
: ---
Assigned To: Epiphany Maintainers
Epiphany Maintainers
Depends on:
Blocks:
 
 
Reported: 2012-08-11 16:19 UTC by Xan Lopez
Modified: 2012-10-07 16:12 UTC
See Also:
GNOME target: ---
GNOME version: ---


Attachments
Import adblock extension into the source tree (65.38 KB, patch)
2012-10-01 19:12 UTC, Xan Lopez
committed Details | Review
Add adblock GSetting, use it (4.32 KB, patch)
2012-10-01 19:12 UTC, Xan Lopez
committed Details | Review
uri-tester: do not store the adblock data in the 'extensions' dir (868 bytes, patch)
2012-10-01 19:12 UTC, Xan Lopez
committed Details | Review
prefs-dialog: add a checkbox to enable/disable the adblock functionality (25.52 KB, patch)
2012-10-01 19:12 UTC, Xan Lopez
committed Details | Review
ephy-adblock-manager: use new coding style (7.45 KB, patch)
2012-10-02 20:04 UTC, Xan Lopez
committed Details | Review
Remove UI code from adblock, un-extensionify it (32.01 KB, patch)
2012-10-02 20:04 UTC, Xan Lopez
committed Details | Review
Move adblock extension to embed/ (3.14 KB, patch)
2012-10-02 20:04 UTC, Xan Lopez
committed Details | Review
adblock: we don't use the edit rules stuff anymore, remove it (4.09 KB, patch)
2012-10-02 20:04 UTC, Xan Lopez
committed Details | Review
adblock: get rid of AdBlock interface (19.88 KB, patch)
2012-10-02 20:04 UTC, Xan Lopez
committed Details | Review

Description Xan Lopez 2012-08-11 16:19:26 UTC
It's important enough that we should really just ship it together with the browser. The only question, I think, is whether we should enable it by default or not.
Comment 1 Bastien Nocera 2012-09-24 20:20:16 UTC
Do you want to use this bug as a blocker bug for adblock bugs? Bug 617944 is a must-fix for example.
Comment 2 Xan Lopez 2012-09-25 13:46:02 UTC
(In reply to comment #1)
> Do you want to use this bug as a blocker bug for adblock bugs? Bug 617944 is a
> must-fix for example.

Sure, we can do that.
Comment 3 Xan Lopez 2012-10-01 19:12:41 UTC
Created attachment 225521 [details] [review]
Import adblock extension into the source tree

This commit imports the adblock extension from 'epiphany-extensions'
with as few modifications as possible. Further modifications and
simplifications are possible, but for now we just load it
unconditionally, enabled.

We have it in the src/ directory because it depends on some high-level
objects in Epiphany (EphyExtension, EphyWindow), but in the future
we'll probably move it to embed/, transforming it from an extension
into just the specific implementation of our EphyAdblockManager
object.
Comment 4 Xan Lopez 2012-10-01 19:12:44 UTC
Created attachment 225522 [details] [review]
Add adblock GSetting, use it

org.gnome.epiphany.web.enable-adblock, controls whether adblock is
enabled (globally).
Comment 5 Xan Lopez 2012-10-01 19:12:47 UTC
Created attachment 225523 [details] [review]
uri-tester: do not store the adblock data in the 'extensions' dir

We are on our way to stop being an extension.
Comment 6 Xan Lopez 2012-10-01 19:12:50 UTC
Created attachment 225524 [details] [review]
prefs-dialog: add a checkbox to enable/disable the adblock functionality
Comment 7 Xan Lopez 2012-10-01 19:13:21 UTC
OK, this is the basic stuff. Extension is integrated, some minor tweaks to make it work, and a GSetting + UI to control it. Seems to work fine.
Comment 8 Xan Lopez 2012-10-02 20:04:16 UTC
Created attachment 225616 [details] [review]
ephy-adblock-manager: use new coding style
Comment 9 Xan Lopez 2012-10-02 20:04:19 UTC
Created attachment 225617 [details] [review]
Remove UI code from adblock, un-extensionify it

We are not using this code for now, easy enough to re-add somehow if
we want to provide a UI to edit the adblock rules. With that gone,
it's now trivial to drop the extension code too, so now the adblocker
is just a GObject implementing the Adblock interface.
Comment 10 Xan Lopez 2012-10-02 20:04:23 UTC
Created attachment 225618 [details] [review]
Move adblock extension to embed/

No reason for it to be in src/ now.
Comment 11 Xan Lopez 2012-10-02 20:04:27 UTC
Created attachment 225619 [details] [review]
adblock: we don't use the edit rules stuff anymore, remove it
Comment 12 Xan Lopez 2012-10-02 20:04:30 UTC
Created attachment 225620 [details] [review]
adblock: get rid of AdBlock interface

No need for this now, just make EphyAdBlock a concrete class
implementing the adblock functionality.
Comment 13 Xan Lopez 2012-10-07 16:12:21 UTC
Well it seems there's not that many "blocker" bugs for this, so let's just fix #617944 and close this.