[Pkg-xfce-commits] r5368 - in desktop/trunk/thunar/debian: . patches

[Yves-Alexis Perez]

Author: corsac
Date: 2011-04-15 13:24:23 +0000 (Fri, 15 Apr 2011)
New Revision: 5368

Added:
   desktop/trunk/thunar/debian/patches/03_Don-t-interpret-file-display-names-as-format-strings.patch
Modified:
   desktop/trunk/thunar/debian/changelog
   desktop/trunk/thunar/debian/patches/series
Log:
* debian/patches:
  - 03_Don-t-interpret-file-display-names-as-format-strings.patch
    added, fix format string error.

Modified: desktop/trunk/thunar/debian/changelog
===================================================================
--- desktop/trunk/thunar/debian/changelog	2011-04-11 14:08:44 UTC (rev 5367)
+++ desktop/trunk/thunar/debian/changelog	2011-04-15 13:24:23 UTC (rev 5368)
@@ -5,6 +5,9 @@
     - drop Emanuele and Simon from uploaders, thanks to them.
   * debian/watch:
     - only pick stable versions.
+  * debian/patches:
+    - 03_Don-t-interpret-file-display-names-as-format-strings.patch
+      added, fix format string error.
 
  -- Yves-Alexis Perez <corsac at debian.org>  Thu, 31 Mar 2011 13:51:36 +0200
 

Added: desktop/trunk/thunar/debian/patches/03_Don-t-interpret-file-display-names-as-format-strings.patch
===================================================================
--- desktop/trunk/thunar/debian/patches/03_Don-t-interpret-file-display-names-as-format-strings.patch	                        (rev 0)
+++ desktop/trunk/thunar/debian/patches/03_Don-t-interpret-file-display-names-as-format-strings.patch	2011-04-15 13:24:23 UTC (rev 5368)
@@ -0,0 +1,29 @@
+From 03dd312e157d4fa8a11d5fa402706ae5b05806fa Mon Sep 17 00:00:00 2001
+From: Lionel Le Folgoc <lionel at lefolgoc.net>
+Date: Fri, 15 Apr 2011 13:12:38 +0200
+Subject: [PATCH] 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>
+---
+ thunar/thunar-transfer-job.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/thunar/thunar-transfer-job.c b/thunar/thunar-transfer-job.c
+index f77839f..c38cf85 100644
+--- a/thunar/thunar-transfer-job.c
++++ b/thunar/thunar-transfer-job.c
+@@ -534,7 +534,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) */
+-- 
+1.7.4.1
+

Modified: desktop/trunk/thunar/debian/patches/series
===================================================================
--- desktop/trunk/thunar/debian/patches/series	2011-04-11 14:08:44 UTC (rev 5367)
+++ desktop/trunk/thunar/debian/patches/series	2011-04-15 13:24:23 UTC (rev 5368)
@@ -1,2 +1,3 @@
 01_use-system-tdb.patch
 02_thunar-icon-naming-spec-compliance.patch
+03_Don-t-interpret-file-display-names-as-format-strings.patch