Bump version to 1.0.4.1

	* configure.in: Bump version to 1.0.4.1

	* cut-n-paste-code/widgets/e-paned/e-paned.c: (e_paned_expose):
	Fix type cast that was causing Ben trouble compiling on Solaris.

	Take a cut at removing the problem where opening a new window
	causes all the old windows to act as if all items were re-added.

	* libnautilus-private/nautilus-directory.h:
	* libnautilus-private/nautilus-directory.c:
	(nautilus_directory_file_monitor_add),
	(nautilus_self_check_directory):
	* libnautilus-private/nautilus-directory-async.c:
	(nautilus_directory_monitor_add_internal):
	* libnautilus-private/nautilus-directory-private.h:
	* libnautilus-private/nautilus-merged-directory.c:
	(build_merged_callback_list), (merged_file_monitor_add),
	(forward_files_added_cover), (forward_files_changed_cover),
	(monitor_add_directory), (merged_add_real_directory):
	* libnautilus-private/nautilus-trash-file.c: (real_monitor_add):
	* libnautilus-private/nautilus-trash-monitor.c:
	(nautilus_trash_monitor_initialize):
	* libnautilus-private/nautilus-vfs-directory.c:
	(vfs_file_monitor_add):
	* libnautilus-private/nautilus-vfs-file.c: (vfs_file_monitor_add):
	Change monitor_add to take a parameter for a callback function, and
	call that instead of sending out a files_added message when someone
	starts monitoring files.

	* components/tree/nautilus-tree-model.c:
	(nautilus_tree_model_node_begin_monitoring_no_connect),
	(nautilus_tree_model_node_begin_monitoring),
	(nautilus_tree_model_directory_files_changed_callback):
	* src/file-manager/fm-directory-view.c: (connect_script_handlers),
	(finish_loading):
	Pass in a callback function to monitor_add, and don't hook up the
	files_added and files_changed signals until after the monitor is
	added.

1 files changed, 6 insertions, 7 deletions

diff --git a/cut-n-paste-code/widgets/e-paned/e-paned.c b/cut-n-paste-code/widgets/e-paned/e-paned.c
index bd84b7933..bedca3cca 100644
--- a/cut-n-paste-code/widgets/e-paned/e-paned.c
+++ b/cut-n-paste-code/widgets/e-paned/e-paned.c
@@ -325,7 +325,7 @@ e_paned_expose (GtkWidget      *widget,
 		  GdkEventExpose *event)
 {
   EPaned *paned;
-  GdkEventExpose child_event;
+  GdkEvent child_event;
 
   g_return_val_if_fail (widget != NULL, FALSE);
   g_return_val_if_fail (E_IS_PANED (widget), FALSE);
@@ -339,7 +339,6 @@ e_paned_expose (GtkWidget      *widget,
 	{
 	  if (e_paned_handle_shown(paned))
 	    {
-	      child_event = *event;
 	      event->area.x += paned->handle_xpos;
 	      event->area.y += paned->handle_ypos;
 	      gtk_widget_draw (widget, &event->area);
@@ -347,16 +346,16 @@ e_paned_expose (GtkWidget      *widget,
 	}
       else
 	{
-	  child_event = *event;
+	  child_event.expose = *event;
 	  if (paned->child1 &&
 	      GTK_WIDGET_NO_WINDOW (paned->child1) &&
-	      gtk_widget_intersect (paned->child1, &event->area, &child_event.area))
-	    gtk_widget_event (paned->child1, (GdkEvent *) &child_event);
+	      gtk_widget_intersect (paned->child1, &event->area, &child_event.expose.area))
+	    gtk_widget_event (paned->child1, &child_event);
 
 	  if (paned->child2 &&
 	      GTK_WIDGET_NO_WINDOW (paned->child2) &&
-	      gtk_widget_intersect (paned->child2, &event->area, &child_event.area))
-	    gtk_widget_event (paned->child2, (GdkEvent *) &child_event);
+	      gtk_widget_intersect (paned->child2, &event->area, &child_event.expose.area))
+	    gtk_widget_event (paned->child2, &child_event);
 	}
     }