reviewed by: Gene Z. Ragan <gzr@eazel.com>

2001-01-31  Pavel Cisler  <pavel@eazel.com>

	reviewed by: Gene Z. Ragan <gzr@eazel.com>

	Fix 5324 (Should get rid of stack-based GnomeVFSFileInfo)

	* components/adapter/bonobo-stream-vfs.c: (vfs_get_info):
	Nuked some unused code that contained gnome_vfs_file_info_init.

	* components/adapter/nautilus-adapter-progressive-load-strategy.c:
	(nautilus_adapter_progressive_load_strategy_load_location):
	* libnautilus-extensions/nautilus-icon-factory.c:
	(path_represents_svg_image), (get_cache_time):
	* libnautilus-extensions/nautilus-thumbnails.c:
	(first_file_more_recent):
	* src/nautilus-window-menus.c: (get_static_bookmarks_file_path):
	Get rid of gnome_vfs_file_info_init.
	Replace all instances of stack-based GnomeVFSFileInfo
	structures, replace all calls to gnome_vfs_file_info_init
	with gnome_vfs_file_info_new.
	Replace most calls to gnome_vfs_file_info_clear with
	gnome_vfs_file_info_unref.

	* libnautilus-extensions/nautilus-preferences-item.c:
	(has_image_file):
	Rework to use gnome_vfs_uri_exists instead of trying to get
	file info.

	* components/adapter/nautilus-adapter-progressive-load-strategy.c:
	(nautilus_adapter_progressive_load_strategy_load_location):
	Fixed a bug where file info fields were being used after a
	gnome_vfs_file_info_clear call


	Fix 6146 ("Duplicate File" reports "You cannot copy a file
		   over itself")

	* libnautilus-extensions/nautilus-file-operations.c:
	(nautilus_file_operations_copy_move):
	Make copying iside the same directory while the
	GNOME_VFS_XFER_USE_UNIQUE_NAMES move_option is set legal.

1 files changed, 8 insertions, 8 deletions

diff --git a/libnautilus-private/nautilus-thumbnails.c b/libnautilus-private/nautilus-thumbnails.c
index 6d57b3f7b..39521d3d0 100644
--- a/libnautilus-private/nautilus-thumbnails.c
+++ b/libnautilus-private/nautilus-thumbnails.c
@@ -170,7 +170,7 @@ first_file_more_recent(const char* file_uri, const char* other_file_uri)
 	GnomeVFSURI *vfs_uri, *other_vfs_uri;
 	gboolean more_recent, is_local;
 	
-	GnomeVFSFileInfo file_info, other_file_info;
+	GnomeVFSFileInfo *file_info, *other_file_info;
 
 	/* if either file is remote, return FALSE.  Eventually we'll make this async to fix this */
 	vfs_uri = gnome_vfs_uri_new(file_uri);
@@ -184,16 +184,16 @@ first_file_more_recent(const char* file_uri, const char* other_file_uri)
 	}
 	
 	/* gather the info and then compare modification times */
-	gnome_vfs_file_info_init (&file_info);
-	gnome_vfs_get_file_info (file_uri, &file_info, GNOME_VFS_FILE_INFO_DEFAULT);
+	file_info = gnome_vfs_file_info_new ();
+	gnome_vfs_get_file_info (file_uri, file_info, GNOME_VFS_FILE_INFO_DEFAULT);
 	
-	gnome_vfs_file_info_init (&other_file_info);
-	gnome_vfs_get_file_info (other_file_uri, &other_file_info, GNOME_VFS_FILE_INFO_DEFAULT);
+	other_file_info = gnome_vfs_file_info_new ();
+	gnome_vfs_get_file_info (other_file_uri, other_file_info, GNOME_VFS_FILE_INFO_DEFAULT);
 
-	more_recent = file_info.mtime > other_file_info.mtime;
+	more_recent = file_info->mtime > other_file_info->mtime;
 
-	gnome_vfs_file_info_clear (&file_info);
-	gnome_vfs_file_info_clear (&other_file_info);
+	gnome_vfs_file_info_unref (file_info);
+	gnome_vfs_file_info_unref (other_file_info);
 
 	return more_recent;
 }