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

[Yves-Alexis Perez]

Author: corsac-guest
Date: 2007-01-13 12:20:35 +0100 (Sat, 13 Jan 2007)
New Revision: 1048

Added:
   desktop/trunk/thunar/debian/patches/02_thunar-vfs-path_uri-list-crash.patch
   desktop/trunk/thunar/debian/patches/03_fix-zn_CH-translation.patch
Modified:
   desktop/trunk/thunar/debian/changelog
Log:
add zn_CH translation fix and crash on lots-of-files drag & drop fix.


Modified: desktop/trunk/thunar/debian/changelog
===================================================================
--- desktop/trunk/thunar/debian/changelog	2007-01-10 15:40:54 UTC (rev 1047)
+++ desktop/trunk/thunar/debian/changelog	2007-01-13 11:20:35 UTC (rev 1048)
@@ -1,8 +1,12 @@
 thunar (0.5.0rc2-2) UNRELEASED; urgency=low
 
   * debian/control: recommends dbus.				closes: #402419
+  * debian/patches, added:
+    - 02_thunar-vfs-path_uri-list-crash.patch: fix crash when drag and
+      dropping large number of files.
+    - 03_fix-zn_CH-translation.patch: fix zn_CH translation.	closes: #406634
 
- -- Yves-Alexis Perez <corsac at corsac.net>  Mon, 11 Dec 2006 23:32:21 +0100
+ -- Yves-Alexis Perez <corsac at corsac.net>  Sat, 13 Jan 2007 12:11:09 +0100
 
 thunar (0.5.0rc2-1) unstable; urgency=low
 

Added: desktop/trunk/thunar/debian/patches/02_thunar-vfs-path_uri-list-crash.patch
===================================================================
--- desktop/trunk/thunar/debian/patches/02_thunar-vfs-path_uri-list-crash.patch	2007-01-10 15:40:54 UTC (rev 1047)
+++ desktop/trunk/thunar/debian/patches/02_thunar-vfs-path_uri-list-crash.patch	2007-01-13 11:20:35 UTC (rev 1048)
@@ -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;
+         }
+     }

Added: desktop/trunk/thunar/debian/patches/03_fix-zn_CH-translation.patch
===================================================================
--- desktop/trunk/thunar/debian/patches/03_fix-zn_CH-translation.patch	2007-01-10 15:40:54 UTC (rev 1047)
+++ desktop/trunk/thunar/debian/patches/03_fix-zn_CH-translation.patch	2007-01-13 11:20:35 UTC (rev 1048)
@@ -0,0 +1,11 @@
+--- po/zh_CN.po    2007-01-12 16:46:32.000000000 +0800
++++ po/new.po      2007-01-12 16:50:39.000000000 +0800
+@@ -2016,7 +2016,7 @@
+
+ #: ../thunar/thunar-standard-view.c:319
+ msgid "_Paste"
+-msgstr "复制(_P)"
++msgstr "粘贴(_P)"
+
+ #: ../thunar/thunar-standard-view.c:319
+ msgid "Move or copy files previously selected by a Cut or Copy command"