[Pkg-xfce-commits] r1078 - in desktop/branches/etch/thunar/debian: . patches

[Yves-Alexis Perez]

Author: corsac-guest
Date: 2007-01-22 03:28:10 +0100 (Mon, 22 Jan 2007)
New Revision: 1078

Added:
   desktop/branches/etch/thunar/debian/patches/02_thunar-vfs-path_uri-list-crash.patch
Modified:
   desktop/branches/etch/thunar/debian/changelog
   desktop/branches/etch/thunar/debian/patches/03_fix-zn_CH-translation.patch
   desktop/branches/etch/thunar/debian/patches/04_fix-fr_FR-translation.patch
Log:
modify path in patch and add crash fix for dnd.


Modified: desktop/branches/etch/thunar/debian/changelog
===================================================================
--- desktop/branches/etch/thunar/debian/changelog	2007-01-22 01:27:53 UTC (rev 1077)
+++ desktop/branches/etch/thunar/debian/changelog	2007-01-22 02:28:10 UTC (rev 1078)
@@ -3,8 +3,10 @@
   * debian/patches:
     - add fr_FR translation fixes by Cyril Brulebois.		closes: #406365
     - add zn_CH translation fixes by guo yixuan.
+    - 02_thunar-vfs-path_uri-list-crash.patch: fix a crash when drag&dropping
+      lots of files.
 
- -- Yves-Alexis Perez <corsac at corsac.net>  Mon, 22 Jan 2007 02:05:56 +0100
+ -- Yves-Alexis Perez <corsac at corsac.net>  Mon, 22 Jan 2007 03:27:12 +0100
 
 thunar (0.4.0rc1-2) unstable; urgency=low
 

Added: desktop/branches/etch/thunar/debian/patches/02_thunar-vfs-path_uri-list-crash.patch
===================================================================
--- desktop/branches/etch/thunar/debian/patches/02_thunar-vfs-path_uri-list-crash.patch	2007-01-22 01:27:53 UTC (rev 1077)
+++ desktop/branches/etch/thunar/debian/patches/02_thunar-vfs-path_uri-list-crash.patch	2007-01-22 02:28:10 UTC (rev 1078)
@@ -0,0 +1,36 @@
+Index: thunar-vfs/thunar-vfs-path.c
+===================================================================
+--- thunar-vfs/thunar-vfs-path.c	(revision 23810)
++++ thunar-vfs/thunar-vfs-path.c	(working copy)
+@@ -1058,21 +1058,28 @@
+     {
+       for (;;)
+         {
+-          /* increase the buffer automatically if required (already including the line break) */
+-          n = thunar_vfs_path_to_uri (lp->data, buffer + bufpos, bufsize - (bufpos + 2), NULL);
+-          if (G_UNLIKELY (n < 0))
++          /* determine the size required to store the URI and the line break */
++          n = thunar_vfs_path_escape_uri_length (lp->data) + 2;
++          if (n > (bufsize - bufpos))
+             {
++              /* automatically increase the buffer */
+               bufsize += 512;
+               buffer = g_realloc (buffer, bufsize + 1);
+               continue;
+             }
+ 
++          /* append the URI to the buffer */
++          n = thunar_vfs_path_escape_uri (lp->data, buffer + bufpos);
++
+           /* shift the buffer position */
+           bufpos += (n - 1);
+ 
+           /* append a line break */
+           buffer[bufpos++] = '\r';
+           buffer[bufpos++] = '\n';
++
++          /* sanity checks */
++          _thunar_vfs_assert (bufpos <= bufsize);
+           break;
+         }
+     }

Modified: desktop/branches/etch/thunar/debian/patches/03_fix-zn_CH-translation.patch
===================================================================
--- desktop/branches/etch/thunar/debian/patches/03_fix-zn_CH-translation.patch	2007-01-22 01:27:53 UTC (rev 1077)
+++ desktop/branches/etch/thunar/debian/patches/03_fix-zn_CH-translation.patch	2007-01-22 02:28:10 UTC (rev 1078)
@@ -1,5 +1,5 @@
---- zh_CN.po    2007-01-12 16:46:32.000000000 +0800
-+++ new.po      2007-01-12 16:50:39.000000000 +0800
+--- po/zh_CN.po    2007-01-12 16:46:32.000000000 +0800
++++ po/zh_CN.po      2007-01-12 16:50:39.000000000 +0800
 @@ -2016,7 +2016,7 @@
 
  #: ../thunar/thunar-standard-view.c:319

Modified: desktop/branches/etch/thunar/debian/patches/04_fix-fr_FR-translation.patch
===================================================================
--- desktop/branches/etch/thunar/debian/patches/04_fix-fr_FR-translation.patch	2007-01-22 01:27:53 UTC (rev 1077)
+++ desktop/branches/etch/thunar/debian/patches/04_fix-fr_FR-translation.patch	2007-01-22 02:28:10 UTC (rev 1078)
@@ -1,5 +1,5 @@
---- fr.po.orig	2007-01-10 14:24:06.000000000 +0100
-+++ fr.po	2007-01-10 15:34:20.000000000 +0100
+--- po/fr.po.orig	2007-01-10 14:24:06.000000000 +0100
++++ po/fr.po	2007-01-10 15:34:20.000000000 +0100
 @@ -61,46 +61,46 @@
  #: ../thunar-vfs/thunar-vfs-io-local-xfer.c:520
  #, c-format