Added separate ability to get file info with a slow mime type in addition

2000-10-06  Rebecca Schulman  <rebecka@eazel.com>
	* libnautilus-extensions/nautilus-directory-async.c:
	* libnautilus-extensions/nautilus-directory-private.h:
	(set_up_request_by_file_attributes),
	(update_file_info_in_list_if_needed),
	(dequeue_pending_idle_callback),
	(nautilus_directory_call_when_ready_internal),
	(nautilus_directory_get_info_for_new_files),
	(lacks_slow_mime_type), (wants_slow_mime_type),
	(request_is_satisfied), (start_monitoring_file_list),
	(get_info_callback), (start_getting_file_info):
	Added separate ability to get file info with a
	slow mime type in addition to the regular info.
	This call uses the same call chain, to get file info
	as the default, except it calls the async_get_file_info
	call with arguments to specify the mime type as slow.
	Since the file info structure itself doesn't
	keep track of what kind of mime type is returned,
	we keep track of this in the nautilus directory
	structure itself.

	* libnautilus-extensions/nautilus-file-private.h:
	Changed the file object to keep track of both
	kinds of mime types, and use the default one,
	unless specifically requested otherwise.
	* libnautilus-extensions/nautilus-file.c:
	* libnautilus-extensions/nautilus-file.h:
	(nautilus_file_new_from_info), (destroy),
	(nautilus_file_update_info),
	(nautilus_file_compare_by_type),
	(nautilus_file_get_string_attribute),
	(nautilus_file_get_type_as_string),
	(nautilus_file_get_slow_mime_type), (nautilus_file_get_mime_type),
	(nautilus_file_is_mime_type):
	Add and extra argument to update_info,
	to describe how the mime type was received.
	Altered the mime type call, and added a get_slow_mime_type
	call.  Free and update the new mime type fields where
	appropriate.
	* libnautilus-extensions/nautilus-icon-container.c:
	(nautilus_icon_container_start_renaming_selected_item):
	Added a comment about where we'll need to
	add code to fix bug 690
	* libnautilus-extensions/nautilus-mime-actions.c:
	(get_mime_type_from_file):
	Updated the mime type call here to request the
	slow mime type.

1 files changed, 2 insertions, 0 deletions

diff --git a/libnautilus-private/nautilus-icon-container.c b/libnautilus-private/nautilus-icon-container.c
index 3a31b7a35..0485b4343 100644
--- a/libnautilus-private/nautilus-icon-container.c
+++ b/libnautilus-private/nautilus-icon-container.c
@@ -4317,6 +4317,8 @@ nautilus_icon_container_start_renaming_selected_item (NautilusIconContainer *con
 		(gnome_canvas_item_new (gnome_canvas_root (GNOME_CANVAS (container)),
 					nautilus_icon_text_item_get_type (),
 					NULL));
+	/* Connect the text item to the clipboard */
+
 
 	/* Determine widget position widget in container */
 	font = details->label_font[details->zoom_level];