Commit b0e9bb20 authored by Andy Hertzfeld's avatar Andy Hertzfeld

made reading metafile from directory where we don't have write permissions



	made reading metafile from directory where we don't have write
	permissions work properly by looking in the common place on any error,
	not just if we get ACCESS_DENIED
parent df3078be
2000-01-18 Andy Hertzfeld <andy@eazel.com>
* libnautilus/nautilus-directory.c
* libnautilus/nautilus-directory:
* made reading metafile from directory where we don't have write
permissions work by changing error-check to look in common place on
any error instead of just access_denied.
2000-01-18 Andy Hertzfeld <andy@eazel.com>
* libnautilus/nautilus-directory.c:
fixed bug caused by Elliot where he used alloca but forgot to remove g_free
2000-01-18 Elliot Lee <sopwith@redhat.com>
......
......@@ -235,7 +235,7 @@ nautilus_directory_read_metafile (NautilusDirectory *directory)
g_return_if_fail (NAUTILUS_IS_DIRECTORY (directory));
result = nautilus_directory_try_to_read_metafile (directory);
if (result == GNOME_VFS_ERROR_ACCESSDENIED && !directory->details->is_alternate_metafile_uri)
if (result != GNOME_VFS_OK && !directory->details->is_alternate_metafile_uri)
if (nautilus_directory_switch_to_alternate_metafile_uri (directory))
result = nautilus_directory_try_to_read_metafile (directory);
......
......@@ -235,7 +235,7 @@ nautilus_directory_read_metafile (NautilusDirectory *directory)
g_return_if_fail (NAUTILUS_IS_DIRECTORY (directory));
result = nautilus_directory_try_to_read_metafile (directory);
if (result == GNOME_VFS_ERROR_ACCESSDENIED && !directory->details->is_alternate_metafile_uri)
if (result != GNOME_VFS_OK && !directory->details->is_alternate_metafile_uri)
if (nautilus_directory_switch_to_alternate_metafile_uri (directory))
result = nautilus_directory_try_to_read_metafile (directory);
......
......@@ -235,7 +235,7 @@ nautilus_directory_read_metafile (NautilusDirectory *directory)
g_return_if_fail (NAUTILUS_IS_DIRECTORY (directory));
result = nautilus_directory_try_to_read_metafile (directory);
if (result == GNOME_VFS_ERROR_ACCESSDENIED && !directory->details->is_alternate_metafile_uri)
if (result != GNOME_VFS_OK && !directory->details->is_alternate_metafile_uri)
if (nautilus_directory_switch_to_alternate_metafile_uri (directory))
result = nautilus_directory_try_to_read_metafile (directory);
......
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