[Xfce4-commits] <midori:master> Escape paths and custom strings in about:version/ paths

Sun Mar 10 23:58:03 CET 2013

Updating branch refs/heads/master
         to 81d3e2d62aa6808533babd7e07dbeb69210ed772 (commit)
       from 02e52bf2ec58a251125bfde0fbd1686c653c6bae (commit)

commit 81d3e2d62aa6808533babd7e07dbeb69210ed772
Author: Christian Dywan <christian at twotoasts.de>
Date:   Sun Mar 10 23:56:28 2013 +0100

    Escape paths and custom strings in about:version/ paths
    
    Fixes: https://bugs.launchpad.net/midori/+bug/1049016

 midori/midori-view.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/midori/midori-view.c b/midori/midori-view.c
index f776b7f..54b9000 100644
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -4188,7 +4188,7 @@ midori_view_set_uri (MidoriView*  view,
             {
                 gchar* res_dir = midori_paths_get_res_filename ("");
                 gchar* lib_dir = midori_paths_get_lib_path (PACKAGE_NAME);
-                data = g_strdup_printf ("<body><h1>%s</h1>"
+                data = g_markup_printf_escaped ("<body><h1>%s</h1>"
                     "<p>config: <code>%s</code></p>"
                     "<p>res: <code>%s</code></p>"
                     "<p>lib: <code>%s</code></p>"
@@ -4217,12 +4217,12 @@ midori_view_set_uri (MidoriView*  view,
                     "style=\"position: absolute; right: 15px; bottom: 15px; z-index: -9;\">"
                     "<table>",
                     _("Version numbers in brackets show the version used at runtime."));
-                midori_view_add_version (tmp, TRUE, g_strdup_printf ("Command line %s",
+                midori_view_add_version (tmp, TRUE, g_markup_printf_escaped ("Command line %s",
                     command_line));
                 midori_view_list_versions (tmp, TRUE);
-                midori_view_add_version (tmp, TRUE, g_strdup_printf ("Platform %s %s %s",
+                midori_view_add_version (tmp, TRUE, g_markup_printf_escaped ("Platform %s %s %s",
                     platform, sys_name, architecture ? architecture : ""));
-                midori_view_add_version (tmp, TRUE, g_strdup_printf ("Identification %s",
+                midori_view_add_version (tmp, TRUE, g_markup_printf_escaped ("Identification %s",
                     ident));
                 midori_view_add_version (tmp, TRUE, g_strdup_printf ("Video Formats %s",
                     list_video_formats (view)));
