summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--components/music/nautilus-music-view.c2
-rw-r--r--libnautilus-private/nautilus-icon-factory.c2
-rw-r--r--src/nautilus-navigation-window-menus.c4
-rw-r--r--src/nautilus-window-menus.c4
5 files changed, 14 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index d12de0ea0..830ed553a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2001-06-06 Darin Adler <darin@bentspoon.com>
+ * components/music/nautilus-music-view.c: (play_current_file):
+ * libnautilus-private/nautilus-icon-factory.c: (get_cache_time):
+ * src/nautilus-window-menus.c: (get_static_bookmarks_file_path):
+ Oops, a few of my changes were still in the editor. More places
+ where we should follow links.
+
+2001-06-06 Darin Adler <darin@bentspoon.com>
+
Frederic Devernay <Frederic.Devernay@sophia.inria.fr>
pointed out that the icon factory wasn't following links.
I found similar problems elsewhere.
diff --git a/components/music/nautilus-music-view.c b/components/music/nautilus-music-view.c
index e54e76f22..a587459dd 100644
--- a/components/music/nautilus-music-view.c
+++ b/components/music/nautilus-music-view.c
@@ -1225,7 +1225,7 @@ play_current_file (NautilusMusicView *music_view, gboolean from_start)
music_view->details->current_duration = length;
g_free (title);
- result = gnome_vfs_get_file_info (song_info->path_uri, &file_info, GNOME_VFS_FILE_INFO_DEFAULT);
+ result = gnome_vfs_get_file_info (song_info->path_uri, &file_info, GNOME_VFS_FILE_INFO_FOLLOW_LINKS);
if (result != GNOME_VFS_OK) {
/* File must be unavailable for some reason. Let's yank it from the list */
gtk_clist_remove (GTK_CLIST (music_view->details->song_list), music_view->details->selected_index);
diff --git a/libnautilus-private/nautilus-icon-factory.c b/libnautilus-private/nautilus-icon-factory.c
index 3138d648b..9084b8ef6 100644
--- a/libnautilus-private/nautilus-icon-factory.c
+++ b/libnautilus-private/nautilus-icon-factory.c
@@ -1837,7 +1837,7 @@ get_cache_time (const char *file_uri, time_t *cache_time)
/* Gather the info and then compare modification times. */
file_info = gnome_vfs_file_info_new ();
- result = gnome_vfs_get_file_info (file_uri, file_info, GNOME_VFS_FILE_INFO_DEFAULT);
+ result = gnome_vfs_get_file_info (file_uri, file_info, GNOME_VFS_FILE_INFO_FOLLOW_LINKS);
if (result == GNOME_VFS_OK) {
*cache_time = file_info->mtime;
}
diff --git a/src/nautilus-navigation-window-menus.c b/src/nautilus-navigation-window-menus.c
index ecdc00b53..0a08a99dc 100644
--- a/src/nautilus-navigation-window-menus.c
+++ b/src/nautilus-navigation-window-menus.c
@@ -953,12 +953,12 @@ get_static_bookmarks_file_path (void)
/* both files exist, so use the one with the most recent mod-date */
update_uri = gnome_vfs_get_uri_from_local_path (update_xml_file_path);
update_info = gnome_vfs_file_info_new ();
- gnome_vfs_get_file_info (update_uri, update_info, GNOME_VFS_FILE_INFO_DEFAULT);
+ gnome_vfs_get_file_info (update_uri, update_info, GNOME_VFS_FILE_INFO_FOLLOW_LINKS);
g_free (update_uri);
built_in_uri = gnome_vfs_get_uri_from_local_path (built_in_xml_file_path);
built_in_info = gnome_vfs_file_info_new ();
- gnome_vfs_get_file_info (built_in_uri, built_in_info, GNOME_VFS_FILE_INFO_DEFAULT);
+ gnome_vfs_get_file_info (built_in_uri, built_in_info, GNOME_VFS_FILE_INFO_FOLLOW_LINKS);
g_free (built_in_uri);
/* see which is most recent */
diff --git a/src/nautilus-window-menus.c b/src/nautilus-window-menus.c
index ecdc00b53..0a08a99dc 100644
--- a/src/nautilus-window-menus.c
+++ b/src/nautilus-window-menus.c
@@ -953,12 +953,12 @@ get_static_bookmarks_file_path (void)
/* both files exist, so use the one with the most recent mod-date */
update_uri = gnome_vfs_get_uri_from_local_path (update_xml_file_path);
update_info = gnome_vfs_file_info_new ();
- gnome_vfs_get_file_info (update_uri, update_info, GNOME_VFS_FILE_INFO_DEFAULT);
+ gnome_vfs_get_file_info (update_uri, update_info, GNOME_VFS_FILE_INFO_FOLLOW_LINKS);
g_free (update_uri);
built_in_uri = gnome_vfs_get_uri_from_local_path (built_in_xml_file_path);
built_in_info = gnome_vfs_file_info_new ();
- gnome_vfs_get_file_info (built_in_uri, built_in_info, GNOME_VFS_FILE_INFO_DEFAULT);
+ gnome_vfs_get_file_info (built_in_uri, built_in_info, GNOME_VFS_FILE_INFO_FOLLOW_LINKS);
g_free (built_in_uri);
/* see which is most recent */