Commit 68359c8c authored by Seth Nickell's avatar Seth Nickell Committed by Seth Nickell

Changed calls to gnome_vfs_append_path to use the similar but more

2000-05-31  Seth Nickell  <snickell@stanford.edu>

	* libnautilus-extensions/nautilus-directory.c:
	(construct_alternate_metafile_uri), (nautilus_directory_new):
	* libnautilus-extensions/nautilus-file.c:
	(nautilus_file_matches_uri), (nautilus_file_get_uri):
	Changed calls to gnome_vfs_append_path to use the similar
	but more specific gnome_vfs_append_file_name instead.
parent d90f8124
2000-05-31 Seth Nickell <snickell@stanford.edu>
* libnautilus-extensions/nautilus-directory.c:
(construct_alternate_metafile_uri), (nautilus_directory_new):
* libnautilus-extensions/nautilus-file.c:
(nautilus_file_matches_uri), (nautilus_file_get_uri):
Changed calls to gnome_vfs_append_path to use the similar
but more specific gnome_vfs_append_file_name instead.
2000-05-31 Darin Adler <darin@eazel.com>
* libnautilus-extensions/nautilus-file.c:
......
......@@ -351,7 +351,7 @@ construct_alternate_metafile_uri (GnomeVFSURI *uri)
/* Ensure that the metafiles directory exists. */
nautilus_directory_uri = gnome_vfs_uri_new (nautilus_get_user_directory ());
metafiles_directory_uri = gnome_vfs_uri_append_path (nautilus_directory_uri,
metafiles_directory_uri = gnome_vfs_uri_append_file_name (nautilus_directory_uri,
METAFILES_DIRECTORY_NAME);
gnome_vfs_uri_unref (nautilus_directory_uri);
result = nautilus_make_directory_and_parents (metafiles_directory_uri,
......@@ -369,7 +369,7 @@ construct_alternate_metafile_uri (GnomeVFSURI *uri)
g_free (escaped_uri);
/* Construct a URI for something in the "metafiles" directory. */
alternate_uri = gnome_vfs_uri_append_path (metafiles_directory_uri, file_name);
alternate_uri = gnome_vfs_uri_append_file_name (metafiles_directory_uri, file_name);
gnome_vfs_uri_unref (metafiles_directory_uri);
g_free (file_name);
......@@ -389,7 +389,7 @@ nautilus_directory_new (const char* uri)
return NULL;
}
metafile_uri = gnome_vfs_uri_append_path (vfs_uri, METAFILE_NAME);
metafile_uri = gnome_vfs_uri_append_file_name (vfs_uri, METAFILE_NAME);
alternate_metafile_uri = construct_alternate_metafile_uri (vfs_uri);
directory = gtk_type_new (NAUTILUS_TYPE_DIRECTORY);
......
......@@ -675,7 +675,7 @@ nautilus_file_matches_uri (NautilusFile *file, const char *uri_string)
return FALSE;
result = FALSE;
file_uri = gnome_vfs_uri_append_path (file->details->directory->details->uri,
file_uri = gnome_vfs_uri_append_file_name (file->details->directory->details->uri,
file->details->info->name);
if (match_uri != NULL) {
......@@ -1196,7 +1196,7 @@ nautilus_file_get_uri (NautilusFile *file)
g_return_val_if_fail (NAUTILUS_IS_FILE (file), NULL);
uri = gnome_vfs_uri_append_path
uri = gnome_vfs_uri_append_file_name
(file->details->directory->details->uri,
file->details->info->name);
uri_text = gnome_vfs_uri_to_string (uri, GNOME_VFS_URI_HIDE_NONE);
......
......@@ -351,7 +351,7 @@ construct_alternate_metafile_uri (GnomeVFSURI *uri)
/* Ensure that the metafiles directory exists. */
nautilus_directory_uri = gnome_vfs_uri_new (nautilus_get_user_directory ());
metafiles_directory_uri = gnome_vfs_uri_append_path (nautilus_directory_uri,
metafiles_directory_uri = gnome_vfs_uri_append_file_name (nautilus_directory_uri,
METAFILES_DIRECTORY_NAME);
gnome_vfs_uri_unref (nautilus_directory_uri);
result = nautilus_make_directory_and_parents (metafiles_directory_uri,
......@@ -369,7 +369,7 @@ construct_alternate_metafile_uri (GnomeVFSURI *uri)
g_free (escaped_uri);
/* Construct a URI for something in the "metafiles" directory. */
alternate_uri = gnome_vfs_uri_append_path (metafiles_directory_uri, file_name);
alternate_uri = gnome_vfs_uri_append_file_name (metafiles_directory_uri, file_name);
gnome_vfs_uri_unref (metafiles_directory_uri);
g_free (file_name);
......@@ -389,7 +389,7 @@ nautilus_directory_new (const char* uri)
return NULL;
}
metafile_uri = gnome_vfs_uri_append_path (vfs_uri, METAFILE_NAME);
metafile_uri = gnome_vfs_uri_append_file_name (vfs_uri, METAFILE_NAME);
alternate_metafile_uri = construct_alternate_metafile_uri (vfs_uri);
directory = gtk_type_new (NAUTILUS_TYPE_DIRECTORY);
......
......@@ -675,7 +675,7 @@ nautilus_file_matches_uri (NautilusFile *file, const char *uri_string)
return FALSE;
result = FALSE;
file_uri = gnome_vfs_uri_append_path (file->details->directory->details->uri,
file_uri = gnome_vfs_uri_append_file_name (file->details->directory->details->uri,
file->details->info->name);
if (match_uri != NULL) {
......@@ -1196,7 +1196,7 @@ nautilus_file_get_uri (NautilusFile *file)
g_return_val_if_fail (NAUTILUS_IS_FILE (file), NULL);
uri = gnome_vfs_uri_append_path
uri = gnome_vfs_uri_append_file_name
(file->details->directory->details->uri,
file->details->info->name);
uri_text = gnome_vfs_uri_to_string (uri, GNOME_VFS_URI_HIDE_NONE);
......
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