Commit 95eab3b0 authored by Seth Nickell's avatar Seth Nickell Committed by Seth Nickell

Added entry for placeholder broken-symlink icon.

2000-07-27  Seth Nickell  <seth@eazel.com>

	* icons/Makefile.am:
	Added entry for placeholder broken-symlink icon.

	* libnautilus-extensions/nautilus-file.c:
	(nautilus_file_get_permissions_as_string),
	(nautilus_file_is_symbolic_link):
	Use new Gnome-VFS flags for symlink follow detection.

	* libnautilus-extensions/nautilus-icon-factory.c:
	(nautilus_icon_factory_get_icon_name_for_file):
	Deal w/ broken symbolic links properly.
parent ce407a0b
2000-07-27 Seth Nickell <seth@eazel.com>
* icons/Makefile.am:
Added entry for placeholder broken-symlink icon.
* libnautilus-extensions/nautilus-file.c:
(nautilus_file_get_permissions_as_string),
(nautilus_file_is_symbolic_link):
Use new Gnome-VFS flags for symlink follow detection.
* libnautilus-extensions/nautilus-icon-factory.c:
(nautilus_icon_factory_get_icon_name_for_file):
Deal w/ broken symbolic links properly.
2000-07-27 Arlo Rose <arlo@eazel.com>
* icons/arlo/i-directory.png
......
......@@ -142,6 +142,7 @@ icon_DATA =\
i-regular.png \
i-sock.png \
i-stalled.png \
i-symlink.png \
i-zipdisk.png \
i-zipdisk2.png \
increment.png \
......
......@@ -2451,7 +2451,7 @@ nautilus_file_get_permissions_as_string (NautilusFile *file)
permissions = file->details->info->permissions;
is_directory = nautilus_file_is_directory (file);
is_link = (file->details->info->type == GNOME_VFS_FILE_TYPE_SYMBOLIC_LINK);
is_link = nautilus_file_is_symbolic_link (file);
/* We use ls conventions for displaying these three obscure flags */
suid = permissions & GNOME_VFS_PERM_SUID;
......@@ -3146,7 +3146,7 @@ gboolean
nautilus_file_is_symbolic_link (NautilusFile *file)
{
return info_missing (file, GNOME_VFS_FILE_INFO_FIELDS_FLAGS)
? FALSE : (file->details->info->type == GNOME_VFS_FILE_TYPE_SYMBOLIC_LINK);
? FALSE : (file->details->info->flags & GNOME_VFS_FILE_FLAGS_SYMLINK);
}
/**
......
......@@ -78,7 +78,7 @@ static const char *icon_file_name_suffixes[] =
#define ICON_NAME_FIFO "i-fifo"
#define ICON_NAME_CHARACTER_DEVICE "i-chardev"
#define ICON_NAME_BLOCK_DEVICE "i-blockdev"
#define ICON_NAME_SYMBOLIC_LINK "i-symlink"
#define ICON_NAME_BROKEN_SYMBOLIC_LINK "i-symlink"
#define ICON_NAME_THUMBNAIL_LOADING "loading"
......@@ -540,7 +540,7 @@ nautilus_icon_factory_get_icon_name_for_file (NautilusFile *file)
case GNOME_VFS_FILE_TYPE_BLOCK_DEVICE:
return ICON_NAME_BLOCK_DEVICE;
case GNOME_VFS_FILE_TYPE_SYMBOLIC_LINK:
return ICON_NAME_SYMBOLIC_LINK;
return ICON_NAME_BROKEN_SYMBOLIC_LINK;
case GNOME_VFS_FILE_TYPE_REGULAR:
case GNOME_VFS_FILE_TYPE_UNKNOWN:
default:
......
......@@ -2451,7 +2451,7 @@ nautilus_file_get_permissions_as_string (NautilusFile *file)
permissions = file->details->info->permissions;
is_directory = nautilus_file_is_directory (file);
is_link = (file->details->info->type == GNOME_VFS_FILE_TYPE_SYMBOLIC_LINK);
is_link = nautilus_file_is_symbolic_link (file);
/* We use ls conventions for displaying these three obscure flags */
suid = permissions & GNOME_VFS_PERM_SUID;
......@@ -3146,7 +3146,7 @@ gboolean
nautilus_file_is_symbolic_link (NautilusFile *file)
{
return info_missing (file, GNOME_VFS_FILE_INFO_FIELDS_FLAGS)
? FALSE : (file->details->info->type == GNOME_VFS_FILE_TYPE_SYMBOLIC_LINK);
? FALSE : (file->details->info->flags & GNOME_VFS_FILE_FLAGS_SYMLINK);
}
/**
......
......@@ -78,7 +78,7 @@ static const char *icon_file_name_suffixes[] =
#define ICON_NAME_FIFO "i-fifo"
#define ICON_NAME_CHARACTER_DEVICE "i-chardev"
#define ICON_NAME_BLOCK_DEVICE "i-blockdev"
#define ICON_NAME_SYMBOLIC_LINK "i-symlink"
#define ICON_NAME_BROKEN_SYMBOLIC_LINK "i-symlink"
#define ICON_NAME_THUMBNAIL_LOADING "loading"
......@@ -540,7 +540,7 @@ nautilus_icon_factory_get_icon_name_for_file (NautilusFile *file)
case GNOME_VFS_FILE_TYPE_BLOCK_DEVICE:
return ICON_NAME_BLOCK_DEVICE;
case GNOME_VFS_FILE_TYPE_SYMBOLIC_LINK:
return ICON_NAME_SYMBOLIC_LINK;
return ICON_NAME_BROKEN_SYMBOLIC_LINK;
case GNOME_VFS_FILE_TYPE_REGULAR:
case GNOME_VFS_FILE_TYPE_UNKNOWN:
default:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment