Frederic Devernay <Frederic.Devernay@sophia.inria.fr>

	pointed out that the icon factory wasn't following links.
	I found similar problems elsewhere.

	* components/music/nautilus-music-view.c:
	(nautilus_music_view_update):
	* libnautilus-private/nautilus-customization-data.c:
	(nautilus_customization_data_new),
	(nautilus_customization_data_get_next_element_for_display):
	* libnautilus-private/nautilus-icon-factory.c:
	(path_represents_svg_image):
	* libnautilus-private/nautilus-metafile.c:
	(metafile_read_check_for_directory):
	* libnautilus-private/nautilus-thumbnails.c:
	(first_file_more_recent):
	* src/nautilus-link-set-window.c: (get_link_set_names),
	(nautilus_link_set_configure_window):
	* src/nautilus-property-browser.c: (ensure_uri_is_image):
	Updated all places where we were using the gnome-vfs file info
	calls and not following links.

4 files changed, 13 insertions, 10 deletions

diff --git a/libnautilus-private/nautilus-customization-data.c b/libnautilus-private/nautilus-customization-data.c
index 366c3cb92..3bac9e537 100644
--- a/libnautilus-private/nautilus-customization-data.c
+++ b/libnautilus-private/nautilus-customization-data.c
@@ -104,14 +104,16 @@ nautilus_customization_data_new (const char *customization_name,
 		
 		public_result = gnome_vfs_directory_list_load (&data->public_file_list,
 							       public_directory_uri,
-							       GNOME_VFS_FILE_INFO_GET_MIME_TYPE, NULL);
+							       GNOME_VFS_FILE_INFO_GET_MIME_TYPE
+							       | GNOME_VFS_FILE_INFO_FOLLOW_LINKS, NULL);
 		g_free (public_directory_uri);
 	}
 
 	private_directory_uri = get_private_customization_uri (customization_name);
 	private_result = gnome_vfs_directory_list_load (&data->private_file_list,
 							private_directory_uri,
-							GNOME_VFS_FILE_INFO_GET_MIME_TYPE, NULL);
+							GNOME_VFS_FILE_INFO_GET_MIME_TYPE
+							| GNOME_VFS_FILE_INFO_FOLLOW_LINKS, NULL);
 	g_free (private_directory_uri);
 	if (public_result != GNOME_VFS_OK && 
 	    private_result != GNOME_VFS_OK) {
@@ -191,9 +193,8 @@ nautilus_customization_data_get_next_element_for_display (NautilusCustomizationD
 
 	g_assert (current_file_info != NULL);
 
-	if (!eel_istr_has_prefix (current_file_info->mime_type, "image/") ||
-	    eel_istr_has_prefix (current_file_info->name, ".")) {
-		
+	if (!eel_istr_has_prefix (current_file_info->mime_type, "image/")
+	    || eel_istr_has_prefix (current_file_info->name, ".")) {
 		return nautilus_customization_data_get_next_element_for_display (data,
 										 emblem_name,
 										 pixbuf_out,
diff --git a/libnautilus-private/nautilus-icon-factory.c b/libnautilus-private/nautilus-icon-factory.c
index abf00b01f..3138d648b 100644
--- a/libnautilus-private/nautilus-icon-factory.c
+++ b/libnautilus-private/nautilus-icon-factory.c
@@ -1801,7 +1801,9 @@ path_represents_svg_image (const char *path)
 
 	uri = gnome_vfs_get_uri_from_local_path (path);
 	file_info = gnome_vfs_file_info_new ();
-	gnome_vfs_get_file_info (uri, file_info, GNOME_VFS_FILE_INFO_GET_MIME_TYPE);
+	gnome_vfs_get_file_info (uri, file_info,
+				 GNOME_VFS_FILE_INFO_GET_MIME_TYPE
+				 | GNOME_VFS_FILE_INFO_FOLLOW_LINKS);
 	g_free (uri);
 	is_svg = eel_strcmp (file_info->mime_type, "image/svg") == 0;
 	gnome_vfs_file_info_unref (file_info);
diff --git a/libnautilus-private/nautilus-metafile.c b/libnautilus-private/nautilus-metafile.c
index bd2f0d324..2773faca4 100644
--- a/libnautilus-private/nautilus-metafile.c
+++ b/libnautilus-private/nautilus-metafile.c
@@ -1769,7 +1769,7 @@ metafile_read_check_for_directory (NautilusMetafile *metafile)
 	gnome_vfs_async_get_file_info
 		(&metafile->details->read_state->get_file_info_handle,
 		 &fake_list,
-		 GNOME_VFS_FILE_INFO_DEFAULT,
+		 GNOME_VFS_FILE_INFO_FOLLOW_LINKS,
 		 metafile_read_check_for_directory_callback,
 		 metafile);
 }
diff --git a/libnautilus-private/nautilus-thumbnails.c b/libnautilus-private/nautilus-thumbnails.c
index d166bd533..12c0fafb3 100644
--- a/libnautilus-private/nautilus-thumbnails.c
+++ b/libnautilus-private/nautilus-thumbnails.c
@@ -207,7 +207,7 @@ make_thumbnail_uri (const char *image_uri, gboolean directory_only, gboolean use
 /* utility routine that takes two uris and returns true if the first file has been modified later than the second */
 /* FIXME bugzilla.eazel.com 2565: it makes synchronous file info calls, so for now, it returns FALSE if either of the uri's are non-local */
 static gboolean
-first_file_more_recent(const char* file_uri, const char* other_file_uri)
+first_file_more_recent (const char* file_uri, const char* other_file_uri)
 {
 	gboolean more_recent;
 	
@@ -220,10 +220,10 @@ first_file_more_recent(const char* file_uri, const char* other_file_uri)
 	
 	/* gather the info and then compare modification times */
 	file_info = gnome_vfs_file_info_new ();
-	gnome_vfs_get_file_info (file_uri, file_info, GNOME_VFS_FILE_INFO_DEFAULT);
+	gnome_vfs_get_file_info (file_uri, file_info, GNOME_VFS_FILE_INFO_FOLLOW_LINKS);
 	
 	other_file_info = gnome_vfs_file_info_new ();
-	gnome_vfs_get_file_info (other_file_uri, other_file_info, GNOME_VFS_FILE_INFO_DEFAULT);
+	gnome_vfs_get_file_info (other_file_uri, other_file_info, GNOME_VFS_FILE_INFO_FOLLOW_LINKS);
 
 	more_recent = file_info->mtime > other_file_info->mtime;