Index: libgnomevfs/gnome-vfs-xfer.c
===================================================================
RCS file: /cvs/gnome/gnome-vfs/libgnomevfs/gnome-vfs-xfer.c,v
retrieving revision 1.130
diff -u -p -r1.130 gnome-vfs-xfer.c
--- libgnomevfs/gnome-vfs-xfer.c	26 Nov 2005 13:39:51 -0000	1.130
+++ libgnomevfs/gnome-vfs-xfer.c	6 Jan 2006 12:18:56 -0000
@@ -755,10 +755,9 @@ list_add_items_and_size (const GList *na
 	each_params.progress = progress;
 	each_params.result = GNOME_VFS_OK;
 
+	info_options = GNOME_VFS_FILE_INFO_DEFAULT;
 	if (xfer_options & GNOME_VFS_XFER_FOLLOW_LINKS) {
-		info_options = GNOME_VFS_FILE_INFO_FOLLOW_LINKS;
-	} else {
-		info_options = GNOME_VFS_FILE_INFO_DEFAULT;
+		info_options |= GNOME_VFS_FILE_INFO_FOLLOW_LINKS;
 	}
 
 	return gnome_vfs_visit_list (name_uri_list, info_options,
@@ -805,10 +804,9 @@ directory_add_items_and_size (GnomeVFSUR
 	each_params.progress = progress;
 	each_params.result = GNOME_VFS_OK;
 
+	info_options = GNOME_VFS_FILE_INFO_DEFAULT;
 	if (xfer_options & GNOME_VFS_XFER_FOLLOW_LINKS) {
-		info_options = GNOME_VFS_FILE_INFO_FOLLOW_LINKS;
-	} else {
-		info_options = GNOME_VFS_FILE_INFO_DEFAULT;
+		info_options |= GNOME_VFS_FILE_INFO_FOLLOW_LINKS;
 	}
 
 	return gnome_vfs_directory_visit_uri (dir_uri, info_options,
@@ -939,10 +937,9 @@ handle_merged_directory_name_conflicts (
 	if (xfer_options & GNOME_VFS_XFER_SAMEFS)
 		visit_options |= GNOME_VFS_DIRECTORY_VISIT_SAMEFS;
 
+	info_options = GNOME_VFS_FILE_INFO_DEFAULT;
 	if (xfer_options & GNOME_VFS_XFER_FOLLOW_LINKS) {
-		info_options = GNOME_VFS_FILE_INFO_FOLLOW_LINKS;
-	} else {
-		info_options = GNOME_VFS_FILE_INFO_DEFAULT;
+		info_options |= GNOME_VFS_FILE_INFO_FOLLOW_LINKS;
 	}
 
 	params.result = GNOME_VFS_OK;
