1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
|
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 @@
<description>Address of the user’s home page.</description>
</key>
<key type="s" name="keyword-search-url">
- <default>'https://duckduckgo.com/?q=%s&t=epiphany'</default>
+ <default>'https://duckduckgo.com/html/?q=%s&t=epiphany'</default>
<summary>URL Search</summary>
<description>DEPRECATED: This key is deprecated and ignored. Use /org/gnome/epiphany/search-engines instead.</description>
</key>
@@ -29,9 +29,7 @@
<default l10n="messages">
<!-- TRANSLATORS: These are the prepopulated search engines. You should
add country-specific URL query parameters if appropriate. -->
- [('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>
<summary>Default search engines.</summary>
<description>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).</description>
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" },
|
