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

[From: subversion at stage.maemo.org]

Author: richard
Date: 2007-09-07 10:36:47 +0300 (Fri, 07 Sep 2007)
New Revision: 13653

Added:
   projects/haf/trunk/osso-gnome-vfs2/debian/patches/38-NB58152-xfer-ignore-missing-files-copy.patch
Modified:
   projects/haf/trunk/osso-gnome-vfs2/debian/changelog
Log:
Fix NB#58152.

Modified: projects/haf/trunk/osso-gnome-vfs2/debian/changelog
===================================================================
--- projects/haf/trunk/osso-gnome-vfs2/debian/changelog	2007-09-06 16:40:56 UTC (rev 13652)
+++ projects/haf/trunk/osso-gnome-vfs2/debian/changelog	2007-09-07 07:36:47 UTC (rev 13653)
@@ -1,8 +1,9 @@
 osso-gnome-vfs2 (2.16.3-1osso28) unstable; urgency=low
 
   * Rework the fix for NB#66755 to be correct.
+  * Fixes: NB#58152, Paste operation is interrupted when some files are missing
 	
- -- Richard Hult <richard at imendio.com>  Wed,  5 Sep 2007 09:02:14 +0200
+ -- Richard Hult <richard at imendio.com>  Fri,  7 Sep 2007 09:24:54 +0200
 
 osso-gnome-vfs2 (2.16.3-1osso27) unstable; urgency=low
 

Added: projects/haf/trunk/osso-gnome-vfs2/debian/patches/38-NB58152-xfer-ignore-missing-files-copy.patch
===================================================================
--- projects/haf/trunk/osso-gnome-vfs2/debian/patches/38-NB58152-xfer-ignore-missing-files-copy.patch	2007-09-06 16:40:56 UTC (rev 13652)
+++ projects/haf/trunk/osso-gnome-vfs2/debian/patches/38-NB58152-xfer-ignore-missing-files-copy.patch	2007-09-07 07:36:47 UTC (rev 13653)
@@ -0,0 +1,44 @@
+Index: libgnomevfs/gnome-vfs-xfer.c
+===================================================================
+--- libgnomevfs/gnome-vfs-xfer.c	(revision 13606)
++++ libgnomevfs/gnome-vfs-xfer.c	(working copy)
+@@ -676,7 +676,11 @@ gnome_vfs_visit_list (const GList *name_
+ 				result = gnome_vfs_directory_visit_uri (uri, info_options, 
+ 					visit_options, callback, data);
+ 			}
++		} else if (result == GNOME_VFS_ERROR_NOT_FOUND) {
++			/* uri not found, do not treat as a real error */
++			result = GNOME_VFS_OK;
+ 		}
++
+ 		gnome_vfs_file_info_unref (info);
+ 		
+ 		if (result != GNOME_VFS_OK) {
+@@ -1766,8 +1770,6 @@ copy_items (const GList *source_uri_list
+ 		int count;
+ 		int progress_result;
+ 
+-		progress->progress_info->file_index++;
+-
+ 		skip = FALSE;
+ 		target_uri = NULL;
+ 
+@@ -1795,6 +1797,8 @@ copy_items (const GList *source_uri_list
+ 			}
+ 			result = GNOME_VFS_OK;
+ 
++			progress->progress_info->file_index++;
++
+ 			/* optionally keep trying until we hit a unique target name */
+ 			for (count = 1; ; count++) {
+ 				GnomeVFSXferOverwriteMode overwrite_mode_abort;
+@@ -1883,6 +1887,9 @@ copy_items (const GList *source_uri_list
+ 			}
+ 
+ 			gnome_vfs_file_info_unref (target_dir_info);
++		} else if (result == GNOME_VFS_ERROR_NOT_FOUND) {
++			/* source uri not found, do not treat as a real error */
++			result = GNOME_VFS_OK;
+ 		}
+ 
+ 		gnome_vfs_file_info_unref (info);