[Xfce4-commits] <thunar:xfce-4.8> Don't interpret file display names as format strings

[Jannis Pohlmann]

Updating branch refs/heads/xfce-4.8
         to 2d14f17a152ac76d8d9c45aeef2d557c1bb10384 (commit)
       from 85917520a01ca48194716833421422b09f484c7c (commit)

commit 2d14f17a152ac76d8d9c45aeef2d557c1bb10384
Author: Lionel Le Folgoc <lionel at lefolgoc.net>
Date:   Fri Apr 15 13:12:38 2011 +0200

    Don't interpret file display names as format strings
    
    This avoids a segfault when copying/moving files containing "%" formatters
    in their name.
    
    Signed-off-by: Jannis Pohlmann <jannis at xfce.org>

 NEWS                         |    1 +
 thunar/thunar-transfer-job.c |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/NEWS b/NEWS
index c72ddf2..69e1e4d 100644
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,7 @@
   Reported and solved by Ambroz Bizjak.
 - Treat backup files as hidden as with thunar-vfs (bug #7615).
 - Speed up initial start by loading the network item later (bug #7373).
+- Another "Don't interpret file display names as format strings" fix.
 
 1.2.1
 =====
diff --git a/thunar/thunar-transfer-job.c b/thunar/thunar-transfer-job.c
index 364bd4e..209e6b8 100644
--- a/thunar/thunar-transfer-job.c
+++ b/thunar/thunar-transfer-job.c
@@ -525,7 +525,7 @@ thunar_transfer_job_copy_node (ThunarTransferJob  *job,
         }
 
       /* update progress information */
-      exo_job_info_message (EXO_JOB (job), g_file_info_get_display_name (info));
+      exo_job_info_message (EXO_JOB (job), "%s", g_file_info_get_display_name (info));
 
 retry_copy:
       /* copy the item specified by this node (not recursively) */