components/library/gnome-vfs/patches/gnome-vfs-05-trash-files-from-patcherent-filesystem.diff

   1 diff -ur gnome-vfs-2.16.1/libgnomevfs/gnome-vfs-xfer.c ../SUNWgnome-vfs-2.16.1.hacked/gnome-vfs-2.16.1/libgnomevfs/gnome-vfs-xfer.c
   2 --- gnome-vfs-2.16.1/libgnomevfs/gnome-vfs-xfer.c       2006-08-21 14:49:48.000000000 +0000
   3 +++ ../SUNWgnome-vfs-2.16.1.hacked/gnome-vfs-2.16.1/libgnomevfs/gnome-vfs-xfer.c        2006-10-20 15:28:26.367491000 +0000
   4 @@ -2390,8 +2390,8 @@
   5         merge_source_uri_list = NULL;
   6         merge_target_uri_list = NULL;
   7
   8 -       if ((xfer_options & GNOME_VFS_XFER_USE_UNIQUE_NAMES) == 0) {
   9 -               /* see if moved files are on the same file system so that we decide to do
  10 +       /* if ((xfer_options & GNOME_VFS_XFER_USE_UNIQUE_NAMES) == 0) {
  11 +                * see if moved files are on the same file system so that we decide to do
  12                  * a simple move or have to do a copy/remove
  13                  */
  14                 for (source_uri = source_uri_list, target_uri = target_uri_list;
  15 @@ -2410,7 +2410,7 @@
  16
  17                         move &= same_fs;
  18                 }
  19 -       }
  20 +       /*}*/
  21
  22         if (target_dir_uri != NULL) {
  23                 gnome_vfs_uri_unref (target_dir_uri);