summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjacob berkman <jacob@ximian.com>2002-07-10 13:42:26 +0000
committerJacob Berkman <jberkman@src.gnome.org>2002-07-10 13:42:26 +0000
commitcdab689a73e7ee020fa9d8bda1af90a757d102e2 (patch)
tree842946535f12229b66c5fec09c51a95acffa47ec
parent7899674802e8be74fac12b9aeee1e738ddd7b3b8 (diff)
downloadgnome-desktop-cdab689a73e7ee020fa9d8bda1af90a757d102e2.tar.gz
follow symlinks (bug #86755)
2002-07-10 jacob berkman <jacob@ximian.com> * gnome-desktop-item.c (gnome_desktop_item_new_from_uri): (gnome_desktop_item_new_from_uri): (gnome_desktop_item_get_file_status): (gnome_desktop_item_set_location): follow symlinks (bug #86755)
-rw-r--r--libgnome-desktop/ChangeLog7
-rw-r--r--libgnome-desktop/gnome-desktop-item.c8
2 files changed, 11 insertions, 4 deletions
diff --git a/libgnome-desktop/ChangeLog b/libgnome-desktop/ChangeLog
index feba0e70..c0d487e8 100644
--- a/libgnome-desktop/ChangeLog
+++ b/libgnome-desktop/ChangeLog
@@ -1,3 +1,10 @@
+2002-07-10 jacob berkman <jacob@ximian.com>
+
+ * gnome-desktop-item.c (gnome_desktop_item_new_from_uri):
+ (gnome_desktop_item_new_from_uri):
+ (gnome_desktop_item_get_file_status):
+ (gnome_desktop_item_set_location): follow symlinks (bug #86755)
+
2002-07-09 Mark McLoughlin <mark@skynet.ie>
* gnome-desktop-item.h, gnome-ditem-edit.c:
diff --git a/libgnome-desktop/gnome-desktop-item.c b/libgnome-desktop/gnome-desktop-item.c
index 8aa2d258..cce3394d 100644
--- a/libgnome-desktop/gnome-desktop-item.c
+++ b/libgnome-desktop/gnome-desktop-item.c
@@ -543,7 +543,7 @@ gnome_desktop_item_new_from_uri (const char *uri,
info = gnome_vfs_file_info_new ();
result = gnome_vfs_get_file_info (uri, info,
- GNOME_VFS_FILE_INFO_DEFAULT);
+ GNOME_VFS_FILE_INFO_FOLLOW_LINKS);
if (result != GNOME_VFS_OK) {
g_set_error (error,
/* FIXME: better errors */
@@ -598,7 +598,7 @@ gnome_desktop_item_new_from_uri (const char *uri,
subfn = g_build_filename (uri, ".directory", NULL);
gnome_vfs_file_info_clear (info);
if (gnome_vfs_get_file_info (subfn, info,
- GNOME_VFS_FILE_INFO_DEFAULT) != GNOME_VFS_OK) {
+ GNOME_VFS_FILE_INFO_FOLLOW_LINKS) != GNOME_VFS_OK) {
gnome_vfs_file_info_unref (info);
g_free (subfn);
@@ -1923,7 +1923,7 @@ gnome_desktop_item_get_file_status (const GnomeDesktopItem *item)
if (item->location == NULL ||
gnome_vfs_get_file_info (item->location, info,
- GNOME_VFS_FILE_INFO_DEFAULT) != GNOME_VFS_OK) {
+ GNOME_VFS_FILE_INFO_FOLLOW_LINKS) != GNOME_VFS_OK) {
gnome_vfs_file_info_unref (info);
return GNOME_DESKTOP_ITEM_DISAPPEARED;
}
@@ -2300,7 +2300,7 @@ gnome_desktop_item_set_location (GnomeDesktopItem *item, const char *location)
info = gnome_vfs_file_info_new ();
res = gnome_vfs_get_file_info (item->location, info,
- GNOME_VFS_FILE_INFO_DEFAULT);
+ GNOME_VFS_FILE_INFO_FOLLOW_LINKS);
if (res == GNOME_VFS_OK &&
info->valid_fields & GNOME_VFS_FILE_INFO_FIELDS_MTIME)