[Xfce4-commits] <midori:master> Put webkit&soup and gtk&glib in the same line in about:

[Christian Dywan]

Updating branch refs/heads/master
         to 81d2567226008d1049c8a6b527cc70479d3dc07d (commit)
       from 8ba3053b4194d485736f910d1582ccb154065aec (commit)

commit 81d2567226008d1049c8a6b527cc70479d3dc07d
Author: Christian Dywan <christian at twotoasts.de>
Date:   Mon May 14 23:02:50 2012 +0200

    Put webkit&soup and gtk&glib in the same line in about:
    
    This makes pasting in a chat much easier.

 midori/midori-view.c |   23 +++++++++--------------
 1 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/midori/midori-view.c b/midori/midori-view.c
index 7459c44..d782482 100644
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -4320,15 +4320,12 @@ midori_view_set_uri (MidoriView*  view,
 
                 /* FIXME: This is for workarounding a crash deeper down the callstack on some systems. */
                 static char const * const version_format_strings[] = {
-                    "<tr><td>libsoup</td><td>%s</td></tr>",
-                    "<tr><td>cairo</td><td>%s ",
-                    "(%s)</td></tr>",
+                    "   libsoup %s</td></tr>",
+                    "<tr><td>cairo</td><td>%s ", "(%s)</td></tr>",
                     "<tr><td>granite</td><td>%s</td></tr>",
                     "<tr><td>libnotify</td><td>%s</td></tr>",
                     "<tr><td>single instance</td><td>%s</td></tr>",
-                    "<tr><td>Platform</td><td>%s ",
-                    "%s ",
-                    "%s</td></tr>",
+                    "<tr><td>Platform</td><td>%s ", "%s ", "%s</td></tr>",
                     "<tr><td>Identification</td><td>%s</td></tr>",
                     "<tr><td>Video Formats</td><td>%s</td></tr>",
                 };
@@ -4366,20 +4363,18 @@ midori_view_set_uri (MidoriView*  view,
                     "<table>"
                     "<tr><td>Command line</td><td>%s</td></tr>"
                     "<tr><td>Midori</td><td>%s (%s)</td></tr>"
-                    "<tr><td>WebKitGTK+</td><td>%d.%d.%d (%d.%d.%d)</td></tr>"
-                    "<tr><td>GTK+</td><td>%d.%d.%d (%d.%d.%d)</td></tr>"
-                    "<tr><td>Glib</td><td>%d.%d.%d (%d.%d.%d)</td></tr>",
+                    "<tr><td>GTK+</td><td>%d.%d.%d (%d.%d.%d)"
+                    "   Glib %d.%d.%d (%d.%d.%d)</td></tr>"
+                    "<tr><td>WebKitGTK+</td><td>%d.%d.%d (%d.%d.%d)",
                     _("Version numbers in brackets show the version used at runtime."),
                     command_line,
                     PACKAGE_VERSION, midori_app_get_name (NULL),
-                    WEBKIT_MAJOR_VERSION, WEBKIT_MINOR_VERSION, WEBKIT_MICRO_VERSION,
-                    webkit_major_version (),
-                    webkit_minor_version (),
-                    webkit_micro_version (),
                     GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION,
                     gtk_major_version, gtk_minor_version, gtk_micro_version,
                     GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION,
-                    glib_major_version, glib_minor_version, glib_micro_version);
+                    glib_major_version, glib_minor_version, glib_micro_version,
+                    WEBKIT_MAJOR_VERSION, WEBKIT_MINOR_VERSION, WEBKIT_MICRO_VERSION,
+                    webkit_major_version (), webkit_minor_version (), webkit_micro_version ());
 
                 for (i = 0;
                      i < sizeof (version_format_strings) / sizeof (version_format_strings[0]);