Ignore some additional generated files.

	* components/services/install/command-line/.cvsignore:
	* components/services/install/lib/.cvsignore:
	Ignore some additional generated files.

	* libnautilus-extensions/nautilus-gnome-extensions.h:
	* libnautilus-extensions/nautilus-gnome-extensions.c:
	Moved stock dialog functions to nautilus-stock-dialogs.[ch].
	(nautilus_gnome_canvas_item_request_update_deep),
	(nautilus_gnome_canvas_request_update_all),
	(nautilus_gnome_canvas_set_scroll_region),
	(nautilus_gnome_canvas_set_scroll_region_left_justify):
	Added a bunch of functions that were previously private inside
	NautilusIconContainer.

	* libnautilus-extensions/nautilus-gtk-extensions.h:
	* libnautilus-extensions/nautilus-gtk-extensions.c:
	(nautilus_gtk_adjustment_set_value),
	(nautilus_gtk_adjustment_clamp_value):
	Added functions that treat the value range in a GtkAdjustment the
	same way scroll bars do, taking the page size into account.

	* libnautilus-extensions/nautilus-horizontal-splitter.h:
	* libnautilus-extensions/nautilus-horizontal-splitter.c:
	(nautilus_horizontal_splitter_initialize),
	(toggle_splitter_position),
	(nautilus_horizontal_splitter_button_press),
	(nautilus_horizontal_splitter_button_release):
	Fixed logic so that splitter will only open or close if you both
	click and release within the splitter itself.

	* libnautilus-extensions/nautilus-icon-private.h:
	* libnautilus-extensions/nautilus-icon-container.c:
	(icon_toggle_selected): Move icons to front when they are selected.
	(set_scroll_region): Moved workaround that sets scroll region to
	be large enough to fill the widget allocation into a function in
	nautilus-gnome-extensions.h. In the process, I fixed the problem
	where it would do the job wrong when the view was zoomed.
	(lay_down_icons), (relayout), (reload_icon_positions):
	Started work on sharing code between automatic layout of the entire
	container and layout of new icons as the arrive.
	(nautilus_icon_container_clear), (nautilus_icon_container_add):
	Got started on the mechanism for laying out new icons as they arrive
	in bunches instead of one at a time.

	* libnautilus-extensions/nautilus-icon-dnd.c:
	* libnautilus-extensions/nautilus-program-chooser.c:
	* libnautilus-extensions/nautilus-program-choosing.c:
	* src/file-manager/dfos-xfer.c:
	* src/file-manager/fm-directory-view.c:
	* src/file-manager/fm-error-reporting.c:
	* src/nautilus-application.c:
	* src/nautilus-location-bar.c:
	* src/nautilus-property-browser.c:
	* src/nautilus-window-manage-views.c:
	* src/nautilus-window-menus.c:
	Added includes to source files that use the stock dialogs.

	* libnautilus-extensions/nautilus-stock-dialogs.h:
	* libnautilus-extensions/nautilus-stock-dialogs.c:
	(nautilus_timed_wait_stop), (convert_varargs_to_name_array),
	(nautilus_simple_dialog), (turn_on_line_wrap_flag),
	(turn_on_line_wrap_flag_callback), (show_ok_box),
	(show_yes_no_box), (nautilus_info_dialog),
	(nautilus_info_dialog_parented), (nautilus_warning_dialog),
	(nautilus_warning_dialog_parented), (nautilus_error_dialog),
	(nautilus_error_dialog_parented), (nautilus_yes_no_dialog),
	(nautilus_yes_no_dialog_parented):
	Moved all the stock dialog code in here.

	* src/nautilus-sidebar-title.c: (update_icon): Only display the
	icon when it's ready, instead of showing generic document icon
	before that time.
	(update_title), (update_more_info), (update_emblems),
	(update_notes): Added FIXMEs about doing the same with other info.
	(nautilus_sidebar_title_button_press_event): Added a FIXME to the
	half-baked code in here.

1 files changed, 24 insertions, 8 deletions

diff --git a/src/nautilus-sidebar-title.c b/src/nautilus-sidebar-title.c
index 2ddb6a22a..29c618037 100644
--- a/src/nautilus-sidebar-title.c
+++ b/src/nautilus-sidebar-title.c
@@ -167,10 +167,15 @@ update_icon (NautilusSidebarTitle *sidebar_title)
 	GdkPixmap *pixmap;
 	GdkBitmap *mask;
 
-	nautilus_icon_factory_get_pixmap_and_mask_for_file
-		(sidebar_title->details->file,
-		 NAUTILUS_ICON_SIZE_STANDARD,
-		 &pixmap, &mask);
+	if (nautilus_icon_factory_is_icon_ready_for_file (sidebar_title->details->file)) {
+		nautilus_icon_factory_get_pixmap_and_mask_for_file
+			(sidebar_title->details->file,
+			 NAUTILUS_ICON_SIZE_STANDARD,
+			 &pixmap, &mask);
+	} else {
+		pixmap = NULL;
+		mask = NULL;
+	}
 
 	gtk_pixmap_set (GTK_PIXMAP (sidebar_title->details->icon),
 			pixmap, mask);
@@ -186,19 +191,24 @@ static void
 update_title (NautilusSidebarTitle *sidebar_title)
 {
 	GdkFont *label_font;
+	const char *title_text;
+
+	/* FIXME: We could defer showing the title until the icon is ready. */
+	title_text = sidebar_title->details->title_text;
 
 	gtk_label_set_text (GTK_LABEL (sidebar_title->details->title),
-			    sidebar_title->details->title_text);
+			    title_text);
 
 	/* FIXME bugzilla.eazel.com 1103: Make this use the font
 	 * factory.
 	 */
 	/* FIXME: Where does the "4" come from? */
 	label_font = nautilus_get_largest_fitting_font
-		(sidebar_title->details->title_text,
+		(title_text,
 		 GTK_WIDGET (sidebar_title)->allocation.width - 4,
 		 "-*-helvetica-medium-r-normal-*-%d-*-*-*-*-*-*-*");
 	nautilus_gtk_widget_set_font (sidebar_title->details->title, label_font);
+	/* FIXME: Is there a font leak here? */
 }
 
 static void
@@ -223,6 +233,8 @@ update_more_info (NautilusSidebarTitle *sidebar_title)
 
 	file = sidebar_title->details->file;
 	
+	/* FIXME: We could defer showing info until the icon is ready. */
+
 	info_string = g_string_new (NULL);
 	type_string = nautilus_file_get_string_attribute (file, "type");
 	if (type_string != NULL) {
@@ -262,6 +274,8 @@ update_emblems (NautilusSidebarTitle *sidebar_title)
 	GList *icons, *p;
 	GdkPixbuf *pixbuf;
 
+	/* FIXME: We could defer showing emblems until the icon is ready. */
+
 	/* First, deallocate any existing ones */
 	gtk_container_foreach (GTK_CONTAINER (sidebar_title->details->emblem_box),
 			       (GtkCallback) gtk_widget_destroy,
@@ -290,6 +304,8 @@ update_notes (NautilusSidebarTitle *sidebar_title)
 {
 	char *text;
 	
+	/* FIXME: We could defer showing notes until the icon is ready. */
+
 	text = nautilus_file_get_metadata (sidebar_title->details->file,
 					   NAUTILUS_METADATA_KEY_NOTES,
 					   NULL);
@@ -365,8 +381,8 @@ nautilus_sidebar_title_set_uri (NautilusSidebarTitle *sidebar_title,
 static gboolean
 nautilus_sidebar_title_button_press_event (GtkWidget *widget, GdkEventButton *event)
 {
-	/* FIXME: We must do something other than a g_message here.
-	 * NautilusSidebarTitle *sidebar_title = NAUTILUS_SIDEBAR_TITLE (widget);  
+	/* FIXME: Do we want to do something when clicked? If not,
+	 * remove this.
 	 */
 	g_message ("button press");
 	return TRUE;