From 33f2620bc08eb4298b32b271bfbbee9c8fafea04 Mon Sep 17 00:00:00 2001 From: James Henstridge Date: Tue, 10 Feb 2004 13:17:52 +0000 Subject: clear the SYMBOLIC_LINK flag if present on the file_info struct. Since 2004-02-10 James Henstridge * font-method.c (fill_file_info): clear the SYMBOLIC_LINK flag if present on the file_info struct. Since gnome-vfs doesn't support cross-vfs symlinks, the symlink would no longer resolve when returned by the fonts:/// method. Fixes bug #133811. --- vfs-methods/fontilus/ChangeLog | 7 +++++++ vfs-methods/fontilus/font-method.c | 6 ++++++ 2 files changed, 13 insertions(+) (limited to 'vfs-methods') diff --git a/vfs-methods/fontilus/ChangeLog b/vfs-methods/fontilus/ChangeLog index 75d327ee4..1342d22b4 100644 --- a/vfs-methods/fontilus/ChangeLog +++ b/vfs-methods/fontilus/ChangeLog @@ -1,3 +1,10 @@ +2004-02-10 James Henstridge + + * font-method.c (fill_file_info): clear the SYMBOLIC_LINK flag if + present on the file_info struct. Since gnome-vfs doesn't support + cross-vfs symlinks, the symlink would no longer resolve when + returned by the fonts:/// method. Fixes bug #133811. + 2004-01-14 Jody Goldberg * Release 2.5.2 diff --git a/vfs-methods/fontilus/font-method.c b/vfs-methods/fontilus/font-method.c index b049d0464..3eae4a9fc 100644 --- a/vfs-methods/fontilus/font-method.c +++ b/vfs-methods/fontilus/font-method.c @@ -253,6 +253,12 @@ fill_file_info(GnomeVFSFileInfo *file_info, GnomeVFSFileInfoOptions options, if (result == GNOME_VFS_OK) { g_free(file_info->name); file_info->name = g_strdup(name); + + file_info->valid_fields &= ~GNOME_VFS_FILE_INFO_FIELDS_SYMLINK_NAME; + g_free(file_info->symlink_name); + file_info->symlink_name = NULL; + file_info->type = GNOME_VFS_FILE_TYPE_REGULAR; + GNOME_VFS_FILE_INFO_SET_SYMLINK(file_info, FALSE); } return result; -- cgit v1.2.1