[maemo-commits] [maemo-commits] r13055 - in projects/haf/trunk/osso-gnome-vfs2/debian: . patches

[From: subversion at stage.maemo.org]

Author: richard
Date: 2007-08-07 16:00:04 +0300 (Tue, 07 Aug 2007)
New Revision: 13055

Added:
   projects/haf/trunk/osso-gnome-vfs2/debian/patches/36-NB65141-xfer-ignore-missing-files.patch
Modified:
   projects/haf/trunk/osso-gnome-vfs2/debian/changelog
Log:
Fix NB#65141.

Modified: projects/haf/trunk/osso-gnome-vfs2/debian/changelog
===================================================================
--- projects/haf/trunk/osso-gnome-vfs2/debian/changelog	2007-08-07 10:54:19 UTC (rev 13054)
+++ projects/haf/trunk/osso-gnome-vfs2/debian/changelog	2007-08-07 13:00:04 UTC (rev 13055)
@@ -1,3 +1,9 @@
+osso-gnome-vfs2 (2.16.3-1osso25~unreleased) unstable; urgency=low
+
+  * Fixes: NB#65141, GnomeVFS stops copy operation if even one of the source files
+	
+ -- Martyn Russell <martyn at imendio.com>  Fri,  3 Aug 2007 16:45:00 +0100
+
 osso-gnome-vfs2 (2.16.3-1osso24) unstable; urgency=low
 
   * Fixes: NB#63225, File manager crashes on opening

Added: projects/haf/trunk/osso-gnome-vfs2/debian/patches/36-NB65141-xfer-ignore-missing-files.patch
===================================================================
--- projects/haf/trunk/osso-gnome-vfs2/debian/patches/36-NB65141-xfer-ignore-missing-files.patch	2007-08-07 10:54:19 UTC (rev 13054)
+++ projects/haf/trunk/osso-gnome-vfs2/debian/patches/36-NB65141-xfer-ignore-missing-files.patch	2007-08-07 13:00:04 UTC (rev 13055)
@@ -0,0 +1,17 @@
+Index: libgnomevfs/gnome-vfs-xfer.c
+===================================================================
+--- libgnomevfs/gnome-vfs-xfer.c	(revision 13054)
++++ libgnomevfs/gnome-vfs-xfer.c	(working copy)
+@@ -2407,6 +2407,12 @@ gnome_vfs_xfer_uri_internal (const GList
+ 			result = gnome_vfs_check_same_fs_uris ((GnomeVFSURI *)source_uri->data, 
+ 				target_dir_uri, &same_fs);
+ 
++			if (result == GNOME_VFS_ERROR_NOT_FOUND) {
++				/* Missing source files is not an error here. */
++				result = GNOME_VFS_OK;
++				continue;
++			}
++			
+ 			if (result != GNOME_VFS_OK) {
+ 				break;
+ 			}