Renamed and changed interface.

	* libnautilus-extensions/nautilus-file.h,
	libnautilus-extensions/nautilus-file.c
	(nautilus_file_get_file_info_result): Renamed and changed
	interface.

	* src/nautilus-applicable-views.c (got_file_info_callback,
	nautilus_navigation_info_new, nautilus_navigation_info_cancel,
	nautilus_navigation_info_free): Reorganize to use the new
	NautilusFile features.

2 files changed, 5 insertions, 11 deletions

diff --git a/libnautilus-extensions/nautilus-file.c b/libnautilus-extensions/nautilus-file.c
index bf15ada0f..64f64c802 100644
--- a/libnautilus-extensions/nautilus-file.c
+++ b/libnautilus-extensions/nautilus-file.c
@@ -3721,19 +3721,14 @@ nautilus_file_is_in_trash (NautilusFile *file)
 	return result;
 }
 
-gboolean
-nautilus_file_get_info_failed (NautilusFile *file,
-			       GnomeVFSResult *result)
+GnomeVFSResult
+nautilus_file_get_file_info_result (NautilusFile *file)
 {
-	g_return_val_if_fail (NAUTILUS_IS_FILE (file), FALSE);
-
 	if (!file->details->get_info_failed) {
-		*result = GNOME_VFS_OK;
-		return FALSE;
+		return GNOME_VFS_OK;
 	}
 
-	*result = file->details->get_info_error;
-	return TRUE;
+	return file->details->get_info_error;
 }
 
 /**
diff --git a/libnautilus-extensions/nautilus-file.h b/libnautilus-extensions/nautilus-file.h
index 6cb380a52..6825d72f2 100644
--- a/libnautilus-extensions/nautilus-file.h
+++ b/libnautilus-extensions/nautilus-file.h
@@ -131,8 +131,7 @@ gboolean                nautilus_file_is_nautilus_link          (NautilusFile
 gboolean                nautilus_file_is_executable             (NautilusFile                  *file);
 gboolean                nautilus_file_is_directory              (NautilusFile                  *file);
 gboolean                nautilus_file_is_in_trash               (NautilusFile                  *file);
-gboolean                nautilus_file_get_info_failed           (NautilusFile                  *file,
-								 GnomeVFSResult                *result);
+GnomeVFSResult          nautilus_file_get_file_info_result      (NautilusFile                  *file);
 gboolean                nautilus_file_get_directory_item_count  (NautilusFile                  *file,
 								 guint                         *count,
 								 gboolean                      *count_unreadable);