Updates nautilus to the latest gnome-vfs changes.

2000-07-21  Mathieu Lacage  <set EMAIL_ADDRESS environment variable>

    Updates nautilus to the latest gnome-vfs changes.

    * components/music/nautilus-music-view.c: (play_current_file),
    (nautilus_music_view_update_from_uri):
    * components/services/vault/command-line/vault-operations.c:
    (vault_list):
    * libnautilus-extensions/bonobo-stream-vfs.c: (vfs_length):
    * libnautilus-extensions/nautilus-directory-async.c:
    (nautilus_directory_get_info_for_new_files),
    (start_monitoring_file_list), (start_getting_directory_counts),
    (deep_count_load), (start_getting_file_info):
    * libnautilus-extensions/nautilus-icon-factory.c:
    (vfs_file_exists), (first_file_more_recent),
    (path_represents_svg_image), (cached_image_still_valid):
    * libnautilus-extensions/nautilus-mime-actions.c:
    (get_mime_type_from_uri):
    * libnautilus-extensions/nautilus-preferences-item.c:
    (has_image_file), (add_icon_themes):
    * src/file-manager/fm-properties-window.c:
    (get_property_names_from_uri):
    * src/nautilus-applicable-views.c: (async_get_file_info_text):
    * src/nautilus-link-set-window.c: (get_link_set_names):
    * src/nautilus-location-bar.c: (try_to_expand_path):
    * src/nautilus-property-browser.c: (ensure_uri_is_image),
    (make_properties_from_directory_path), (vfs_file_exists),
    (make_properties_from_themes):

1 files changed, 2 insertions, 2 deletions

diff --git a/libnautilus-extensions/nautilus-preferences-item.c b/libnautilus-extensions/nautilus-preferences-item.c
index 65b0438a0..b3498ba4c 100644
--- a/libnautilus-extensions/nautilus-preferences-item.c
+++ b/libnautilus-extensions/nautilus-preferences-item.c
@@ -477,7 +477,7 @@ has_image_file(const char *directory_uri, const char *dir_name, const char *requ
 	for (index = 0; index < NAUTILUS_N_ELEMENTS (icon_file_name_suffixes); index++) {
 		temp_str = g_strconcat (base_uri, icon_file_name_suffixes[index], NULL);
 		gnome_vfs_file_info_init (file_info);
-		result = gnome_vfs_get_file_info (temp_str, file_info, 0, NULL);
+		result = gnome_vfs_get_file_info (temp_str, file_info, 0);
 		g_free(temp_str);
 		if (result == GNOME_VFS_OK) {
 			g_free(base_uri);
@@ -509,7 +509,7 @@ add_icon_themes(NautilusStringList *theme_list, char *required_file)
 	g_free (pixmap_directory);
 			
 	result = gnome_vfs_directory_list_load (&list, directory_uri,
-					       GNOME_VFS_FILE_INFO_DEFAULT, NULL, NULL);
+					       GNOME_VFS_FILE_INFO_DEFAULT, NULL);
 	if (result != GNOME_VFS_OK) {
 		g_free(directory_uri);
 		return;