diff --git a/data/org.gnome.epiphany.gschema.xml b/data/org.gnome.epiphany.gschema.xml
index 6540572..e60a082 100644
--- a/data/org.gnome.epiphany.gschema.xml
+++ b/data/org.gnome.epiphany.gschema.xml
@@ -16,7 +16,7 @@
Address of the user’s home page.
- 'https://duckduckgo.com/?q=%s&t=epiphany'
+ 'https://duckduckgo.com/html/?q=%s&t=epiphany'
URL Search
DEPRECATED: This key is deprecated and ignored. Use /org/gnome/epiphany/search-engines instead.
@@ -29,9 +29,7 @@
- [('DuckDuckGo', 'https://duckduckgo.com/?q=%s&t=epiphany', '!ddg'),
- ('Google', 'https://www.google.com/search?q=%s', '!g'),
- ('Bing', 'https://www.bing.com/search?q=%s', '!b')]
+ [('DuckDuckGo', 'https://duckduckgo.com/html/?q=%s&t=epiphany', '!ddg')]
Default search engines.
List of the default search engines. It is an array in which each search engine is described by a name, an address, and a bang (shortcut).
diff --git a/embed/ephy-embed-utils.c b/embed/ephy-embed-utils.c
index de1d5d0..81d4606 100644
--- a/embed/ephy-embed-utils.c
+++ b/embed/ephy-embed-utils.c
@@ -247,7 +247,7 @@ ephy_embed_utils_normalize_address (const char *address)
/* Auto-prepend http:// to anything that is not
* one according to soup, because it probably will be
- * something like "google.com". Special case localhost(:port)
+ * something like "duckduckgo.com/html". Special case localhost(:port)
* and IP(:port), because SoupURI, correctly, thinks it is a
* URI with scheme being localhost/IP and, optionally, path
* being the port. Ideally we should check if we have a
diff --git a/embed/ephy-web-view.c b/embed/ephy-web-view.c
index 8c490f6..5ba6270 100644
--- a/embed/ephy-web-view.c
+++ b/embed/ephy-web-view.c
@@ -537,7 +537,7 @@ ephy_web_view_create_form_auth_save_confirmation_info_bar (EphyWebView *web_view
label = gtk_label_new (NULL);
/* Translators: The %s the hostname where this is happening.
- * Example: mail.google.com.
+ * Example: mail.com.
*/
message = g_markup_printf_escaped (_("Do you want to save your password for “%s”?"), origin);
gtk_label_set_markup (GTK_LABEL (label), message);
diff --git a/lib/ephy-form-auth-data.c b/lib/ephy-form-auth-data.c
index ff407ac..6c36eb5 100644
--- a/lib/ephy-form-auth-data.c
+++ b/lib/ephy-form-auth-data.c
@@ -115,13 +115,13 @@ ephy_form_auth_data_store (const char *uri,
if (username != NULL) {
/* Translators: The first %s is the username and the second one is the
* security origin where this is happening. Example: gnome@gmail.com and
- * https://mail.google.com.
+ * https://mail.com.
*/
label = g_strdup_printf (_("Password for %s in a form in %s"),
username, origin);
} else {
/* Translators: The first %s is the security origin where this is happening.
- * Example: https://mail.google.com.
+ * Example: https://mail.com.
*/
label = g_strdup_printf (_("Password in a form in %s"), origin);
}
diff --git a/lib/ephy-search-engine-manager.h b/lib/ephy-search-engine-manager.h
index 2e92396..c53684e 100644
--- a/lib/ephy-search-engine-manager.h
+++ b/lib/ephy-search-engine-manager.h
@@ -30,7 +30,7 @@ G_BEGIN_DECLS
* the version used in your country. For example for the french version :
* replace the ".com" with ".fr" : "https://duckduckgo.fr/?q=%s&t=epiphany"
*/
-#define EPHY_SEARCH_ENGINE_DEFAULT_ADDRESS _("https://duckduckgo.com/?q=%s&t=epiphany")
+#define EPHY_SEARCH_ENGINE_DEFAULT_ADDRESS _("https://duckduckgo.com/html/?q=%s&t=epiphany")
#define EPHY_TYPE_SEARCH_ENGINE_MANAGER (ephy_search_engine_manager_get_type ())
diff --git a/lib/ephy-uri-helpers.c b/lib/ephy-uri-helpers.c
index be3ef44..a9c4839 100644
--- a/lib/ephy-uri-helpers.c
+++ b/lib/ephy-uri-helpers.c
@@ -146,32 +146,12 @@ is_garbage (const char *name,
const char *field;
const char *host;
} const fields[] = {
- /* analytics.google.com */
{ "utm_source", NULL },
{ "utm_medium", NULL },
{ "utm_term", NULL },
{ "utm_content", NULL },
{ "utm_campaign", NULL },
- { "utm_reader", NULL },
- /* metrika.yandex.ru */
- { "yclid", NULL },
- /* youtube.com */
- { "feature", "youtube.com" },
- /* facebook.com */
- { "fb_action_ids", NULL },
- { "fb_action_types", NULL },
- { "fb_ref", NULL },
- { "fb_source", NULL },
- { "action_object_map", NULL },
- { "action_type_map", NULL },
- { "action_ref_map", NULL },
- { "ref", "facebook.com" },
- { "fref", "facebook.com" },
- { "hc_location", "facebook.com" },
- /* imdb.com */
- { "ref_", "imdb.com" },
- /* addons.mozilla.org */
- { "src", "addons.mozilla.org" }
+ { "utm_reader", NULL }
};
guint i;
diff --git a/src/window-commands.c b/src/window-commands.c
index cd5fc70..a718c17 100644
--- a/src/window-commands.c
+++ b/src/window-commands.c
@@ -1155,11 +1155,7 @@ typedef struct {
} SiteInfo;
static SiteInfo sites[] = {
- { "www.facebook.com", "Facebook" },
- { "twitter.com", "Twitter" },
- { "gmail.com", "GMail" },
- { "plus.google.com", "Google+" },
- { "youtube.com", "YouTube" },
+ { "www.gnu.org/software/social", "GNUSocial" },
};
static char *
diff --git a/tests/ephy-string-test.c b/tests/ephy-string-test.c
index 4ac879e..1ef74d5 100644
--- a/tests/ephy-string-test.c
+++ b/tests/ephy-string-test.c
@@ -30,10 +30,10 @@ typedef struct {
} HostnameTest;
static const HostnameTest hostname_tests[] = {
- { "http://www.google.com", "www.google.com" },
- { "http://www.google.com/this/is/a/path", "www.google.com" },
- { "www.google.com", "www.google.com" },
- { "google.com", "google.com" },
+ { "https://duckduckgo.com/html", "www.duckduckgo.com/html" },
+ { "https://duckduckgo.com/html/this/is/a/path", "www.duckduckgo.com/html" },
+ { "www.duckduckgo.com/html", "www.duckduckgo.com/html" },
+ { "duckduckgo.com/html", "duckduckgo.com/html" },
{ "file:///tmp/", NULL },
{ "about:blank", NULL },
{ "ephy-about:applications", NULL },
diff --git a/tests/ephy-uri-helpers-test.c b/tests/ephy-uri-helpers-test.c
index f536ab9..19ca779 100644
--- a/tests/ephy-uri-helpers-test.c
+++ b/tests/ephy-uri-helpers-test.c
@@ -44,8 +44,6 @@ test_ephy_uri_helpers_remove_tracking (void)
{ "http://git.savannah.gnu.org/gitweb/?p=grep.git;a=commit;h=97318f5e59a1ef6feb8a378434a00932a3fc1e0b",
"http://git.savannah.gnu.org/gitweb/?p=grep.git;a=commit;h=97318f5e59a1ef6feb8a378434a00932a3fc1e0b" },
/* https://bugzilla.gnome.org/show_bug.cgi?id=730464 */
- { "https://mail.google.com/mail/u/0/?ui=2&ik=37373eb942&rid=7cea..&auto=1&view=lno&_reqid=1168127&pcd=1&mb=0&rt=j",
- "https://mail.google.com/mail/u/0/?ui=2&ik=37373eb942&rid=7cea..&auto=1&view=lno&_reqid=1168127&pcd=1&mb=0&rt=j" },
{ "http://www.test.com/?utm_source=feedburner&view=lno&_reqid=1234", "http://www.test.com/?view=lno&_reqid=1234" },
{ "http://www.test.com/?some&valid&query", "http://www.test.com/?some&valid&query" },
{ "http://www.test.com/?utm_source=feedburner&some&valid&query", "http://www.test.com/?some&valid&query" },