[epiphany] Remove ephy-uri-tester-shared.{h,c}
- From: Michael Catanzaro <mcatanzaro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [epiphany] Remove ephy-uri-tester-shared.{h,c}
- Date: Mon, 5 Aug 2019 23:59:27 +0000 (UTC)
commit 42f45409d3240099c5ff3af469a7212150c6a7ca
Author: Adrian Perez de Castro <aperez igalia com>
Date: Mon Jan 28 19:51:03 2019 +0200
Remove ephy-uri-tester-shared.{h,c}
The only definitions being used were the definitions for the ad blocking
rule set URLs, which are moved to ephy-filters-manager.h
embed/ephy-embed-shell.c | 1 -
embed/ephy-filters-manager.c | 1 -
embed/ephy-filters-manager.h | 3 +++
lib/ephy-uri-tester-shared.c | 38 ----------------------------
lib/ephy-uri-tester-shared.h | 33 ------------------------
lib/meson.build | 1 -
src/prefs-dialog.c | 2 +-
src/profile-migrator/ephy-profile-migrator.c | 2 +-
8 files changed, 5 insertions(+), 76 deletions(-)
---
diff --git a/embed/ephy-embed-shell.c b/embed/ephy-embed-shell.c
index 01344a737..3667d3f66 100644
--- a/embed/ephy-embed-shell.c
+++ b/embed/ephy-embed-shell.c
@@ -41,7 +41,6 @@
#include "ephy-snapshot-service.h"
#include "ephy-tabs-catalog.h"
#include "ephy-uri-helpers.h"
-#include "ephy-uri-tester-shared.h"
#include "ephy-view-source-handler.h"
#include "ephy-web-app-utils.h"
#include "ephy-web-process-extension-proxy.h"
diff --git a/embed/ephy-filters-manager.c b/embed/ephy-filters-manager.c
index 5fa0854bc..277a6b10d 100644
--- a/embed/ephy-filters-manager.c
+++ b/embed/ephy-filters-manager.c
@@ -24,7 +24,6 @@
#include "ephy-download.h"
#include "ephy-prefs.h"
#include "ephy-settings.h"
-#include "ephy-uri-tester-shared.h"
#include <gio/gio.h>
diff --git a/embed/ephy-filters-manager.h b/embed/ephy-filters-manager.h
index 38fb53c5e..bd444f08d 100644
--- a/embed/ephy-filters-manager.h
+++ b/embed/ephy-filters-manager.h
@@ -24,6 +24,9 @@
G_BEGIN_DECLS
+#define ADBLOCK_DEFAULT_FILTER_URL "https://easylist.to/easylist/easylist.txt"
+#define ADBLOCK_PRIVACY_FILTER_URL "https://easylist.to/easylist/easyprivacy.txt"
+
#define EPHY_TYPE_FILTERS_MANAGER (ephy_filters_manager_get_type ())
G_DECLARE_FINAL_TYPE (EphyFiltersManager, ephy_filters_manager, EPHY, FILTERS_MANAGER, GObject)
diff --git a/lib/meson.build b/lib/meson.build
index 6a4eeb589..2060d7d4e 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -39,7 +39,6 @@ libephymisc_sources = [
'ephy-sync-utils.c',
'ephy-time-helpers.c',
'ephy-uri-helpers.c',
- 'ephy-uri-tester-shared.c',
'ephy-user-agent.c',
'ephy-web-app-utils.c',
'ephy-zoom.c',
diff --git a/src/prefs-dialog.c b/src/prefs-dialog.c
index 4a9dc9fe0..ee9d3259f 100644
--- a/src/prefs-dialog.c
+++ b/src/prefs-dialog.c
@@ -30,6 +30,7 @@
#include "ephy-embed-utils.h"
#include "ephy-file-chooser.h"
#include "ephy-file-helpers.h"
+#include "ephy-filters-manager.h"
#include "ephy-flatpak-utils.h"
#include "ephy-gui.h"
#include "ephy-langs.h"
@@ -43,7 +44,6 @@
#include "ephy-sync-service.h"
#include "ephy-sync-utils.h"
#include "ephy-time-helpers.h"
-#include "ephy-uri-tester-shared.h"
#include "ephy-web-app-utils.h"
#include "clear-data-dialog.h"
#include "cookies-dialog.h"
diff --git a/src/profile-migrator/ephy-profile-migrator.c b/src/profile-migrator/ephy-profile-migrator.c
index d88159719..744a1b487 100644
--- a/src/profile-migrator/ephy-profile-migrator.c
+++ b/src/profile-migrator/ephy-profile-migrator.c
@@ -23,6 +23,7 @@
#include "ephy-bookmarks-manager.h"
#include "ephy-debug.h"
#include "ephy-file-helpers.h"
+#include "ephy-filters-manager.h"
#include "ephy-history-service.h"
#include "ephy-password-manager.h"
#include "ephy-prefs.h"
@@ -33,7 +34,6 @@
#include "ephy-string.h"
#include "ephy-sync-debug.h"
#include "ephy-sync-utils.h"
-#include "ephy-uri-tester-shared.h"
#include "ephy-web-app-utils.h"
#include "gvdb-builder.h"
#include "gvdb-reader.h"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]