Rename NAUTILUS_FILE_ATTRIBUTE_FAST_MIME_TYPE to

	* libnautilus-extensions/nautilus-file-attributes.h: Rename
	NAUTILUS_FILE_ATTRIBUTE_FAST_MIME_TYPE to
	NAUTILUS_FILE_ATTRIBUTE_MIME_TYPE; add
	NAUTILUS_FILE_ATTRIBUTE_SLOW_MIME_TYPE, for now just a synonym for
	NAUTILUS_FILE_ATTRIBUTE_MIME_TYPE.
	* libnautilus-extensions/nautilus-directory-async.c:
	(set_up_request_by_file_attributes): Handle the new file
	attributes.
	* libnautilus-extensions/nautilus-directory.h: move
	nautilus_directory_wait_until_ready call to
	nautilus-wait-until-ready.h

	* libnautilus-extensions/nautilus-directory.c:
	(nautilus_self_check_directory): Include
	nautilus-wait-until-ready.h, use new attributes.

	* libnautilus-extensions/nautilus-wait-until-ready.h: New header
	for the deprecated wait_until_ready calls.

	* libnautilus-extensions/nautilus-file.c:
	(nautilus_file_wait_until_ready): file equivalent of
	nautilus_directory_wait_until_ready; temporary to help me
	refactor.
	(file_wait_until_ready_callback): helper function.

	* libnautilus-extensions/Makefile.am: Add
	nautilus-wait-until-ready.h

	* libnautilus-extensions/nautilus-icon-factory.c:
	(nautilus_icon_factory_get_required_file_attributes): Use new
	attribute for mime type.

	* libnautilus-extensions/nautilus-mime-actions.h,
	libnautilus-extensions/nautilus-mime-actions.c:
	(nautilus_mime_get_default_action_type_for_uri),
	(nautilus_mime_get_default_action_for_uri),
	(nautilus_mime_get_default_application_for_uri_internal),
	(nautilus_mime_get_default_application_for_uri),
	(nautilus_mime_is_default_application_for_uri_user_chosen),
	(nautilus_mime_get_default_component_for_uri_internal),
	(nautilus_mime_get_default_component_for_uri),
	(nautilus_mime_is_default_component_for_uri_user_chosen),
	(nautilus_mime_get_short_list_applications_for_uri),
	(nautilus_mime_get_short_list_components_for_uri),
	(nautilus_mime_get_short_list_methods_for_uri),
	(nautilus_mime_get_all_applications_for_uri),
	(nautilus_mime_has_any_applications_for_uri),
	(nautilus_mime_get_all_components_for_uri),
	(nautilus_mime_has_any_components_for_uri),
	(nautilus_mime_set_default_action_type_for_uri),
	(nautilus_mime_set_default_application_for_uri),
	(nautilus_mime_set_default_component_for_uri),
	(nautilus_mime_set_short_list_applications_for_uri),
	(nautilus_mime_set_short_list_components_for_uri),
	(nautilus_mime_add_application_to_short_list_for_uri),
	(nautilus_mime_remove_application_from_short_list_for_uri),
	(nautilus_mime_add_component_to_short_list_for_uri),
	(nautilus_mime_remove_component_from_short_list_for_uri),
	(nautilus_mime_extend_all_applications_for_uri),
	(nautilus_mime_remove_from_all_applications_for_uri): All these
	functions now take a NautilusDirectory and a NautilusFile, rather
	than a URI.

	(gnome_vfs_mime_application_has_id),
	(gnome_vfs_mime_id_matches_application),
	(gnome_vfs_mime_application_has_id_not_in_list),
	(string_not_in_list), (extract_prefix_add_suffix),
	(make_oaf_query_with_known_mime_type),
	(make_oaf_query_with_uri_scheme_only), (free_key),
	(server_matches_content_requirements),
	(nautilus_do_component_query), (str_list_difference),
	(strv_concat): Reformatted.

	(get_mime_type_from_file): Changed from get_mime_type_from_uri;
	uses nautilus_file_wait_until_ready instead of synchronous I/O.

	* libnautilus-extensions/nautilus-program-chooser.c:
	(repopulate_program_list), (is_application_default_for_uri),
	(is_component_default_for_uri),
	(is_component_in_short_list_for_uri),
	(is_application_in_short_list_for_uri),
	(program_file_pair_is_default_for_file),
	(add_to_short_list_for_file), (remove_from_short_list_for_file),
	(remove_default_for_item), (set_default_for_item):
	* libnautilus-extensions/nautilus-program-choosing.c:
	(any_programs_available_for_file):
	* libnautilus-extensions/nautilus-wait-until-ready.h:
	* src/file-manager/fm-directory-view.c: (switch_location_and_view),
	(create_open_with_gtk_menu), (reset_bonobo_open_with_menu),
	(activate_callback):
	* src/nautilus-applicable-views.c: (got_file_info_callback),
	(nautilus_navigation_info_new), (nautilus_navigation_info_free):
	* src/nautilus-applicable-views.h:
	* src/nautilus-sidebar.c: (nautilus_sidebar_update_buttons):
	* src/nautilus-theme-selector.c: (add_theme_to_icons):
	* src/nautilus-window.c: (nautilus_window_switch_views),
	(nautilus_window_load_content_view_menu):
	* test/test-nautilus-mime-actions-set.c: (main):
	* test/test-nautilus-mime-actions.c: (main): Deal with above API changes.

2 files changed, 23 insertions, 14 deletions

diff --git a/test/test-nautilus-mime-actions-set.c b/test/test-nautilus-mime-actions-set.c
index 8a38e3931..5da485f5d 100644
--- a/test/test-nautilus-mime-actions-set.c
+++ b/test/test-nautilus-mime-actions-set.c
@@ -101,6 +101,8 @@ main (int argc, char **argv)
         const char *uri;  
 	const char *field;
 	const char *value;
+	NautilusDirectory *directory;
+	NautilusFile *file;
 
 	g_thread_init (NULL);
 	oaf_init (argc, argv);
@@ -116,31 +118,34 @@ main (int argc, char **argv)
 	field = argv[2];
  	value = argv[3];
 
+	directory = nautilus_directory_get (uri);
+	file = nautilus_file_get (uri);
+
 	if (strcmp (field, "default_action_type") == 0) {
 		puts ("default_action_type");
-		nautilus_mime_set_default_action_type_for_uri (uri, str_to_action_type (value));
+		nautilus_mime_set_default_action_type_for_uri (directory, file, str_to_action_type (value));
 	} else if (strcmp (field, "default_application") == 0) {
 		puts ("default_application");
-		nautilus_mime_set_default_application_for_uri (uri, value);
+		nautilus_mime_set_default_application_for_uri (directory, file, value);
 	} else if (strcmp (field, "default_component") == 0) {
 		puts ("default_component");
-		nautilus_mime_set_default_component_for_uri (uri, value);
+		nautilus_mime_set_default_component_for_uri (directory, file, value);
 	} else if (strcmp (field, "short_list_applicationss") == 0) {
 		puts ("short_list_applications");
 		nautilus_mime_set_short_list_applications_for_uri 
-			(uri, comma_separated_str_to_str_list (value));
+			(directory, file, comma_separated_str_to_str_list (value));
 	} else if (strcmp (field, "short_list_components") == 0) {
 		puts ("short_list_components");
 		nautilus_mime_set_short_list_components_for_uri
-			(uri, comma_separated_str_to_str_list (value));
+			(directory, file, comma_separated_str_to_str_list (value));
 	} else if (strcmp (field, "add_to_all_applicationss") == 0) {
 		puts ("add_to_all_applications");
 		nautilus_mime_extend_all_applications_for_uri
-			(uri, comma_separated_str_to_str_list (value));
+			(directory, file, comma_separated_str_to_str_list (value));
 	} else if (strcmp (field, "remove_from_all_applications") == 0) {
 		puts ("remove_from_all_applications");
 		nautilus_mime_remove_from_all_applications_for_uri 
-			(uri, comma_separated_str_to_str_list (value));
+			(directory, file, comma_separated_str_to_str_list (value));
 
 	} else {
 		usage (argv[0]);
diff --git a/test/test-nautilus-mime-actions.c b/test/test-nautilus-mime-actions.c
index 18a3929f1..12f1d758b 100644
--- a/test/test-nautilus-mime-actions.c
+++ b/test/test-nautilus-mime-actions.c
@@ -115,6 +115,8 @@ main (int argc, char **argv)
 	GList *all_applications;
 	GList *short_list_components;
 	GList *short_list_applications;
+	NautilusFile *file;
+	NautilusDirectory *directory;
 
 	g_thread_init (NULL);
 	oaf_init (argc, argv);
@@ -128,38 +130,40 @@ main (int argc, char **argv)
 	}
 
 	uri = argv[1];
+	file = nautilus_file_get (uri);
+	directory = nautilus_directory_get (uri);
 	
-	default_action = nautilus_mime_get_default_action_for_uri (uri);
+	default_action = nautilus_mime_get_default_action_for_uri (directory, file);
 	puts ("Default Action");
 	print_action (default_action);
 	puts ("");
 
-	default_application = nautilus_mime_get_default_application_for_uri (uri);
+	default_application = nautilus_mime_get_default_application_for_uri (directory, file);
 	puts("Default Application");
 	print_application (default_application);
 	puts ("");
 		
-	default_component = nautilus_mime_get_default_component_for_uri (uri);
+	default_component = nautilus_mime_get_default_component_for_uri (directory, file);
 	puts("Default Component");
 	print_component (default_component);
 	puts ("");
 
-	short_list_applications = nautilus_mime_get_short_list_applications_for_uri (uri); 
+	short_list_applications = nautilus_mime_get_short_list_applications_for_uri (directory, file); 
 	puts("Short List Applications");
 	print_application_list (short_list_applications);
 	puts ("");
 
-	short_list_components = nautilus_mime_get_short_list_components_for_uri (uri); 
+	short_list_components = nautilus_mime_get_short_list_components_for_uri (directory, file); 
 	puts("Short List Components");
 	print_component_list (short_list_components);
 	puts ("");
 
-	all_applications = nautilus_mime_get_all_applications_for_uri (uri); 
+	all_applications = nautilus_mime_get_all_applications_for_uri (directory, file); 
 	puts("All Applications");
 	print_application_list (all_applications);
 	puts ("");
 
-	all_components = nautilus_mime_get_all_components_for_uri (uri); 
+	all_components = nautilus_mime_get_all_components_for_uri (directory, file); 
 	puts("All Components");
 	print_component_list (all_components);
 	puts ("");