Commit 448a9ca4 authored by Seth Nickell's avatar Seth Nickell Committed by Seth Nickell
Browse files

Necessary to make Nautilus compile after changing

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

	* libnautilus-extensions/nautilus-file.c:
	(nautilus_file_get_permissions_as_string),
	(nautilus_file_is_symbolic_link):
	* libnautilus-extensions/nautilus-icon-factory.c:
	(nautilus_icon_factory_get_icon_name_for_file):
	Necessary to make Nautilus compile after changing
	GNOME_VFS_FILE_TYPE_BROKEN_SYMLINK to GNOME_VFS_FILE_TYPE_SYMBOLIC_LINK
	and removing the existing flag. See bug 1547 for more information on
	breakages in the way Nautilus handles symbolic links (caused by the
	GnomeVFS changes) such as detecting them in the first place.
parent ae9f25f2
2000-07-03 Seth Nickell <seth@eazel.com>
* libnautilus-extensions/nautilus-file.c:
(nautilus_file_get_permissions_as_string),
(nautilus_file_is_symbolic_link):
* libnautilus-extensions/nautilus-icon-factory.c:
(nautilus_icon_factory_get_icon_name_for_file):
Necessary to make Nautilus compile after changing
GNOME_VFS_FILE_TYPE_BROKEN_SYMLINK to GNOME_VFS_FILE_TYPE_SYMBOLIC_LINK
and removing the existing flag. See bug 1547 for more information on
breakages in the way Nautilus handles symbolic links (caused by the
GnomeVFS changes) such as detecting them in the first place.
2000-07-03 Andy Hertzfeld <andy@eazel.com>
* libnautilus-extensions/nautilus-background.c:
......
......@@ -2314,7 +2314,7 @@ nautilus_file_get_permissions_as_string (NautilusFile *file)
permissions = file->details->info->permissions;
is_directory = nautilus_file_is_directory (file);
is_link = GNOME_VFS_FILE_INFO_SYMLINK (file->details->info);
is_link = (file->details->info->type == GNOME_VFS_FILE_TYPE_SYMBOLIC_LINK);
/* We use ls conventions for displaying these three obscure flags */
suid = permissions & GNOME_VFS_PERM_SUID;
......@@ -3000,7 +3000,7 @@ gboolean
nautilus_file_is_symbolic_link (NautilusFile *file)
{
return info_missing (file, GNOME_VFS_FILE_INFO_FIELDS_FLAGS)
? FALSE : GNOME_VFS_FILE_INFO_SYMLINK (file->details->info);
? FALSE : (file->details->info->type == GNOME_VFS_FILE_TYPE_SYMBOLIC_LINK);
}
/**
......
......@@ -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_BROKEN_SYMBOLIC_LINK "i-brokenlink"
#define ICON_NAME_SYMBOLIC_LINK "i-symlink"
#define ICON_NAME_THUMBNAIL_LOADING "loading"
......@@ -532,8 +532,8 @@ nautilus_icon_factory_get_icon_name_for_file (NautilusFile *file)
return ICON_NAME_CHARACTER_DEVICE;
case GNOME_VFS_FILE_TYPE_BLOCK_DEVICE:
return ICON_NAME_BLOCK_DEVICE;
case GNOME_VFS_FILE_TYPE_BROKEN_SYMBOLIC_LINK:
return ICON_NAME_BROKEN_SYMBOLIC_LINK;
case GNOME_VFS_FILE_TYPE_SYMBOLIC_LINK:
return ICON_NAME_SYMBOLIC_LINK;
case GNOME_VFS_FILE_TYPE_REGULAR:
case GNOME_VFS_FILE_TYPE_UNKNOWN:
default:
......
......@@ -2314,7 +2314,7 @@ nautilus_file_get_permissions_as_string (NautilusFile *file)
permissions = file->details->info->permissions;
is_directory = nautilus_file_is_directory (file);
is_link = GNOME_VFS_FILE_INFO_SYMLINK (file->details->info);
is_link = (file->details->info->type == GNOME_VFS_FILE_TYPE_SYMBOLIC_LINK);
/* We use ls conventions for displaying these three obscure flags */
suid = permissions & GNOME_VFS_PERM_SUID;
......@@ -3000,7 +3000,7 @@ gboolean
nautilus_file_is_symbolic_link (NautilusFile *file)
{
return info_missing (file, GNOME_VFS_FILE_INFO_FIELDS_FLAGS)
? FALSE : GNOME_VFS_FILE_INFO_SYMLINK (file->details->info);
? FALSE : (file->details->info->type == GNOME_VFS_FILE_TYPE_SYMBOLIC_LINK);
}
/**
......
......@@ -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_BROKEN_SYMBOLIC_LINK "i-brokenlink"
#define ICON_NAME_SYMBOLIC_LINK "i-symlink"
#define ICON_NAME_THUMBNAIL_LOADING "loading"
......@@ -532,8 +532,8 @@ nautilus_icon_factory_get_icon_name_for_file (NautilusFile *file)
return ICON_NAME_CHARACTER_DEVICE;
case GNOME_VFS_FILE_TYPE_BLOCK_DEVICE:
return ICON_NAME_BLOCK_DEVICE;
case GNOME_VFS_FILE_TYPE_BROKEN_SYMBOLIC_LINK:
return ICON_NAME_BROKEN_SYMBOLIC_LINK;
case GNOME_VFS_FILE_TYPE_SYMBOLIC_LINK:
return ICON_NAME_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