[Xfce4-commits] <midori:master> Omit micro version and arch from ident string

[Christian Dywan]

Updating branch refs/heads/master
         to 7580ecad8e62633f9f4c05e37a6c466bc3b61564 (commit)
       from 9ae1d173d11f3878701e12742143e2aec03ada70 (commit)

commit 7580ecad8e62633f9f4c05e37a6c466bc3b61564
Author: Christian Dywan <christian at twotoasts.de>
Date:   Sat Feb 20 22:28:52 2010 +0100

    Omit micro version and arch from ident string

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

diff --git a/midori/midori-websettings.c b/midori/midori-websettings.c
index 77cb5f4..8b133cc 100644
--- a/midori/midori-websettings.c
+++ b/midori/midori-websettings.c
@@ -1188,7 +1188,7 @@ get_sys_name (void)
     {
         struct utsname name;
         if (uname (&name) != -1)
-            sys_name = g_strdup_printf ("%s %s", name.sysname, name.machine);
+            sys_name = name.sysname;
         else
             sys_name = "Unix";
     }
@@ -1214,15 +1214,10 @@ generate_ident_string (MidoriIdentity identify_as)
 
     const gchar* os =
     #if HAVE_OSX
-    /* #if defined (HAVE_X86) */
-    "Intel Mac OS X";
-    /* #else
-    "PPC Mac OS X";
-    #endif */
+    "Mac OS X";
     #elif defined (G_OS_UNIX)
     get_sys_name ();
     #elif defined (G_OS_WIN32)
-    // FIXME: Windows NT version
     "Windows";
     #else
     "Unknown";
@@ -1230,8 +1225,7 @@ generate_ident_string (MidoriIdentity identify_as)
 
     const gchar* appname = "Midori/"
         G_STRINGIFY (MIDORI_MAJOR_VERSION) "."
-        G_STRINGIFY (MIDORI_MINOR_VERSION) "."
-        G_STRINGIFY (MIDORI_MICRO_VERSION);
+        G_STRINGIFY (MIDORI_MINOR_VERSION);
 
     const gchar* lang = pango_language_to_string (gtk_get_default_language ());