[Xfce4-commits] <midori:master> No language or encryption but Mozilla in user agent

[Christian Dywan]

Updating branch refs/heads/master
         to 96dda85b81f4d558516f82033d85a4e4cc8fe247 (commit)
       from 6de7c26c53e46f424a40d75cd9402f5706bd127f (commit)

commit 96dda85b81f4d558516f82033d85a4e4cc8fe247
Author: Christian Dywan <christian at twotoasts.de>
Date:   Sun May 1 02:03:30 2011 +0200

    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.

 midori/midori-websettings.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/midori/midori-websettings.c b/midori/midori-websettings.c
index e6e5d3d..5ef3b6f 100644
--- 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",