diff options
| author | James Henstridge <james@daa.com.au> | 2004-02-10 13:17:52 +0000 |
|---|---|---|
| committer | James Henstridge <jamesh@src.gnome.org> | 2004-02-10 13:17:52 +0000 |
| commit | 33f2620bc08eb4298b32b271bfbbee9c8fafea04 (patch) | |
| tree | 21cb5ca083b37e2d0b34745ec9179075656bf776 /vfs-methods | |
| parent | 3aa5e4ceb4d7dc132d65a496806e6e4e546bc065 (diff) | |
| download | gnome-control-center-33f2620bc08eb4298b32b271bfbbee9c8fafea04.tar.gz | |
clear the SYMBOLIC_LINK flag if present on the file_info struct. Since
2004-02-10 James Henstridge <james@daa.com.au>
* 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.
Diffstat (limited to 'vfs-methods')
| -rw-r--r-- | vfs-methods/fontilus/ChangeLog | 7 | ||||
| -rw-r--r-- | vfs-methods/fontilus/font-method.c | 6 |
2 files changed, 13 insertions, 0 deletions
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 <james@daa.com.au> + + * 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 <jody@gnome.org> * 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; |