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, 10 insertions, 10 deletions

diff --git a/libnautilus-extensions/nautilus-icon-factory.c b/libnautilus-extensions/nautilus-icon-factory.c
index 9be2faeae..05575acac 100644
--- a/libnautilus-extensions/nautilus-icon-factory.c
+++ b/libnautilus-extensions/nautilus-icon-factory.c
@@ -1628,7 +1628,7 @@ static gboolean
 path_represents_svg_image (const char *path) 
 {
 	char *uri;
-	GnomeVFSFileInfo file_info;
+	GnomeVFSFileInfo *file_info;
 	gboolean is_svg;
 
 	/* Sync. file I/O is OK here because this is used only for installed
@@ -1637,11 +1637,11 @@ path_represents_svg_image (const char *path)
 	 */
 
 	uri = gnome_vfs_get_uri_from_local_path (path);
-	gnome_vfs_file_info_init (&file_info);
-	gnome_vfs_get_file_info (uri, &file_info, GNOME_VFS_FILE_INFO_GET_MIME_TYPE);
+	file_info = gnome_vfs_file_info_new ();
+	gnome_vfs_get_file_info (uri, file_info, GNOME_VFS_FILE_INFO_GET_MIME_TYPE);
 	g_free (uri);
-	is_svg = nautilus_strcmp (file_info.mime_type, "image/svg") == 0;
-	gnome_vfs_file_info_clear (&file_info);
+	is_svg = nautilus_strcmp (file_info->mime_type, "image/svg") == 0;
+	gnome_vfs_file_info_unref (file_info);
 
 	return is_svg;
 }
@@ -1651,7 +1651,7 @@ static GnomeVFSResult
 get_cache_time (const char *file_uri, time_t *cache_time)
 {
 	GnomeVFSURI *vfs_uri;
-	GnomeVFSFileInfo file_info;
+	GnomeVFSFileInfo *file_info;
 	GnomeVFSResult result;
 	gboolean is_local;
 
@@ -1671,12 +1671,12 @@ get_cache_time (const char *file_uri, time_t *cache_time)
 	}
 	
 	/* Gather the info and then compare modification times. */
-	gnome_vfs_file_info_init (&file_info);
-	result = gnome_vfs_get_file_info (file_uri, &file_info, GNOME_VFS_FILE_INFO_DEFAULT);
+	file_info = gnome_vfs_file_info_new ();
+	result = gnome_vfs_get_file_info (file_uri, file_info, GNOME_VFS_FILE_INFO_DEFAULT);
 	if (result == GNOME_VFS_OK) {
-		*cache_time = file_info.mtime;
+		*cache_time = file_info->mtime;
 	}
-	gnome_vfs_file_info_clear (&file_info);
+	gnome_vfs_file_info_unref (file_info);
 
 	return result;
 }