Fixed an uninitialized variable problem that caused a crash on boot for

	* src/nautilus-sidebar-tabs.c: (draw_or_hit_test_all_tabs):
	Fixed an uninitialized variable problem that caused a crash on
	boot for Kai Lahmann (thanks for the help, Kai).

	* libnautilus-extensions/nautilus-file.c:
	(nautilus_file_compare_for_sort_internal):
	(nautilus_file_get_string_attribute), Got rid of "real_name"
	and made "name" just do what "real_name" did before. Renamed
	"real_directory" to just "directory".

	* src/file-manager/fm-list-view.h:
	* src/file-manager/fm-list-view-private.h:
	* src/file-manager/fm-list-view.c: (fm_list_view_initialize_class),
	(fm_list_view_initialize), (fm_list_view_destroy),
	(fm_list_view_compare_rows), (compare_rows_by_name),
	(match_row_name), (select_matching_name_callback),
	(fm_list_nautilus_file_at), (row_get_data_binder),
	(fm_list_get_drag_pixmap), (create_list), (set_up_list),
	(add_to_list), (get_list), (fm_list_view_begin_loading),
	(fm_list_view_set_zoom_level), (fm_list_view_sort_items),
	(get_column_from_attribute), (get_sort_column_from_attribute),
	(install_row_images), (update_icons),
	(fm_list_view_embedded_text_policy_changed),
	(fm_list_view_image_display_policy_changed),
	(get_number_of_columns), (get_link_column),
	(get_column_specification), (get_column_titles),
	(get_column_attribute), (get_column_sort_criterion),
	(fm_list_view_column_set), (real_get_number_of_columns),
	(real_get_link_column), (real_get_column_specification):
	* src/file-manager/fm-search-list-view.h:
	* src/file-manager/fm-search-list-view.c:
	(fm_search_list_view_initialize_class),
	(fm_search_list_view_initialize), (real_get_number_of_columns),
	(real_get_link_column), (real_get_column_specification):
	Refactored the list view code so that the search list view
	doesn't have to replicate anything and can just describe the
	differences between it and the non-search list view. I was
	able to get rid of a lot of complexity while doing this.
	Changed to use the new "name" and "directory" instead of the
	old "real_name" and "real_directory" at the same time.

	* libnautilus-extensions/nautilus-file.c:
	(nautilus_file_new_from_name), (nautilus_file_get), (destroy),
	(nautilus_file_is_self_owned),
	(nautilus_file_get_parent_uri_as_string),
	(get_file_for_parent_directory), (nautilus_file_rename),
	(nautilus_file_get_gnome_vfs_uri),
	(nautilus_file_get_uri), (nautilus_file_mark_gone),
	(nautilus_file_changed):
	* libnautilus-extensions/nautilus-directory-private.h:
	* libnautilus-extensions/nautilus-directory-async.c:
	(select_needy_file):
	Redid the "self-owning" file handling (for URIs with no parent) so
	that a URI doesn't show up as one of its own children.

	* libnautilus-extensions/nautilus-directory.c:
	(nautilus_directory_is_search_directory):
	Took out "gnome-trash:" which doesn't belong in here. We are doing
	trash at the NautilusDirectory level, not the gnome-vfs level.

	* icons/arlo/backgrounds/.cvsignore: [added]
	* icons/arlo/backgrounds/Makefile.in: [removed]
	Added the missing cvsignore file and got rid of the Makefile.in,
	which should not be in cvs.

1 files changed, 2 insertions, 3 deletions

diff --git a/libnautilus-private/nautilus-directory.c b/libnautilus-private/nautilus-directory.c
index 440f5ba95..4afc89c53 100644
--- a/libnautilus-private/nautilus-directory.c
+++ b/libnautilus-private/nautilus-directory.c
@@ -462,13 +462,12 @@ nautilus_directory_is_search_directory (NautilusDirectory *directory)
 
 	g_return_val_if_fail (NAUTILUS_IS_DIRECTORY (directory), FALSE);
 
-	/* 3 hard-coded schemes for now. */
+	/* Two hard-coded schemes for now. */
 	/* FIXME: Later we gnome-vfs will tell us somehow that this is
 	 * a virtual directory.
 	 */
 	return nautilus_istr_has_prefix (directory->details->uri_text, "search:")
-		|| nautilus_istr_has_prefix (directory->details->uri_text, "gnome-search:")
-		|| nautilus_istr_has_prefix (directory->details->uri_text, "gnome-trash:");
+		|| nautilus_istr_has_prefix (directory->details->uri_text, "gnome-search:");
 
 #if 0
 	GnomeVFSFileInfo *info;