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.

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