No language or encryption but Mozilla in user agent

Motivated by Firefox and Chrome deciding to update their
user agents and removing language as well as encryption,
we do the same. Going for a sort of standardisation we
prefix with Mozilla now. But we won't add the architecture.

Maemo is regarded as a proper platform now.
This commit is contained in:
Christian Dywan 2011-05-01 02:03:30 +02:00
parent 6de7c26c53
commit 96dda85b81

View file

@ -1244,7 +1244,9 @@ static gchar*
generate_ident_string (MidoriIdentity identify_as) generate_ident_string (MidoriIdentity identify_as)
{ {
const gchar* platform = const gchar* platform =
#ifdef GDK_WINDOWING_X11 #if HAVE_HILDON
"Maemo"
#elif defined (GDK_WINDOWING_X11)
"X11"; "X11";
#elif defined(GDK_WINDOWING_WIN32) #elif defined(GDK_WINDOWING_WIN32)
"Windows"; "Windows";
@ -1283,8 +1285,8 @@ generate_ident_string (MidoriIdentity identify_as)
switch (identify_as) switch (identify_as)
{ {
case MIDORI_IDENT_MIDORI: case MIDORI_IDENT_MIDORI:
return g_strdup_printf ("%s (%s; %s; U; %s) WebKit/%d.%d+", return g_strdup_printf ("Mozilla/5.0 (%s; %s) AppleWebKit/%d.%d+ %s",
appname, platform, os, lang, webcore_major, webcore_minor); platform, os, webcore_major, webcore_minor, appname);
case MIDORI_IDENT_SAFARI: case MIDORI_IDENT_SAFARI:
return g_strdup_printf ("Mozilla/5.0 (%s; U; %s; %s) " return g_strdup_printf ("Mozilla/5.0 (%s; U; %s; %s) "
"AppleWebKit/%d+ (KHTML, like Gecko) Version/5.0 Safari/%d.%d+ %s", "AppleWebKit/%d+ (KHTML, like Gecko) Version/5.0 Safari/%d.%d+ %s",