We need to include the .xml.h files in EXTRA_DIST. My mistake turning that

	* components/loser/content/Makefile.am:
	* components/loser/sidebar/Makefile.am:
	* components/mozilla/Makefile.am:
	* components/sample/Makefile.am:
	* components/services/summary/nautilus-view/Makefile.am:
	* libnautilus/Makefile.am:
	* src/Makefile.am:
	* src/file-manager/Makefile.am:
	We need to include the .xml.h files in EXTRA_DIST. My mistake
	turning that off (killed the Tinderbox).

	* src/nautilus-window-manage-views.c:
	(position_and_show_window_callback),
	(nautilus_window_end_location_change_callback): Fix small ref
	mistake I might have introduced with my last check-in.

10 files changed, 36 insertions, 16 deletions

diff --git a/ChangeLog b/ChangeLog
index 0b1b29c62..aa2f4a6b9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,24 @@
+2000-10-20  Darin Adler  <darin@eazel.com>
+
+	* components/loser/content/Makefile.am:
+	* components/loser/sidebar/Makefile.am:
+	* components/mozilla/Makefile.am:
+	* components/sample/Makefile.am:
+	* components/services/summary/nautilus-view/Makefile.am:
+	* libnautilus/Makefile.am:
+	* src/Makefile.am:
+	* src/file-manager/Makefile.am:
+	We need to include the .xml.h files in EXTRA_DIST. My mistake
+	turning that off (killed the Tinderbox).
+	
+	* src/nautilus-window-manage-views.c:
+	(position_and_show_window_callback),
+	(nautilus_window_end_location_change_callback): Fix small ref
+	mistake I might have introduced with my last check-in.
+
 2000-10-20  J Shane Culpepper  <pepper@eazel.com>
 
-	* components/services/summary/nautilus-view/nautilus-summary-view.c
-	:
+	* components/services/summary/nautilus-view/nautilus-summary-view.c:
 	* components/services/summary/nautilus-view/tests/README:
 	* components/services/summary/nautilus-view/tests/redirects.xml:
 	* components/services/summary/nautilus-view/tests/services.xml:
diff --git a/components/loser/content/Makefile.am b/components/loser/content/Makefile.am
index 431b36d48..3ae753a2b 100644
--- a/components/loser/content/Makefile.am
+++ b/components/loser/content/Makefile.am
@@ -39,6 +39,6 @@ nautilus_content_loser_LDADD =			\
 	$(VFS_LIBS)					\
 	$(OAF_LIBS)
 
-EXTRA_DIST = $(oaf_DATA) $(ui_DATA)
+EXTRA_DIST = $(oaf_DATA) $(ui_DATA) $(ui_msgs)
 CLEANFILES = $(ui_msgs)
 BUILT_SOURCES = $(ui_msgs)
diff --git a/components/loser/sidebar/Makefile.am b/components/loser/sidebar/Makefile.am
index 463c98ec9..7c0355865 100644
--- a/components/loser/sidebar/Makefile.am
+++ b/components/loser/sidebar/Makefile.am
@@ -38,6 +38,6 @@ nautilus_sidebar_loser_LDADD =			\
 	$(VFS_LIBS)					\
 	$(OAF_LIBS)
 
-EXTRA_DIST = $(oaf_DATA) $(ui_DATA)
+EXTRA_DIST = $(oaf_DATA) $(ui_DATA) $(ui_msgs)
 CLEANFILES = $(ui_msgs)
 BUILT_SOURCES = $(ui_msgs)
diff --git a/components/mozilla/Makefile.am b/components/mozilla/Makefile.am
index 455e54875..44bfe6368 100644
--- a/components/mozilla/Makefile.am
+++ b/components/mozilla/Makefile.am
@@ -62,6 +62,6 @@ ui_msgs = \
 	nautilus-mozilla-ui.xml.h \
 	$(NULL)
 
-EXTRA_DIST = $(oaf_DATA) $(ui_DATA)
+EXTRA_DIST = $(oaf_DATA) $(ui_DATA) $(ui_msgs)
 BUILT_SOURCES = $(ui_msgs)
 CLEANFILES = $(ui_msgs)
diff --git a/components/sample/Makefile.am b/components/sample/Makefile.am
index 7882478b2..f0e8fbc7d 100644
--- a/components/sample/Makefile.am
+++ b/components/sample/Makefile.am
@@ -36,6 +36,6 @@ nautilus_sample_content_view_LDADD =		\
 	$(VFS_LIBS)				\
 	$(OAF_LIBS)
 
-EXTRA_DIST = $(oaf_DATA) $(ui_DATA)
+EXTRA_DIST = $(oaf_DATA) $(ui_DATA) $(ui_msgs)
 BUILT_SOURCES = $(ui_msgs)
 CLEANFILES = $(ui_msgs)
diff --git a/components/services/summary/nautilus-view/Makefile.am b/components/services/summary/nautilus-view/Makefile.am
index 341d8a1b4..22413ff50 100644
--- a/components/services/summary/nautilus-view/Makefile.am
+++ b/components/services/summary/nautilus-view/Makefile.am
@@ -49,6 +49,6 @@ nautilus_summary_view_LDADD =						\
 	$(AMMONITE_LIBS)						\
 	$(NULL)
 
-EXTRA_DIST = $(oaf_DATA) $(ui_DATA)
+EXTRA_DIST = $(oaf_DATA) $(ui_DATA) $(ui_msgs)
 BUILT_SOURCES = $(ui_msgs)
 CLEANFILES = $(ui_msgs)
diff --git a/libnautilus/Makefile.am b/libnautilus/Makefile.am
index 89cb4ad63..68fc8ca41 100644
--- a/libnautilus/Makefile.am
+++ b/libnautilus/Makefile.am
@@ -81,6 +81,7 @@ ui_msgs = \
 
 EXTRA_DIST = \
 	$(ui_DATA)			\
+	$(ui_msgs)			\
 	nautilus-view-component.idl	\
 	nautilus-distributed-undo.idl	\
 	$(NULL)
diff --git a/src/Makefile.am b/src/Makefile.am
index b3bc391e0..8a1668932 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -160,16 +160,18 @@ CLEANFILES = \
 	$(NULL)
 
 EXTRA_DIST = \
-	check-nautilus \
-	nautilus-shell-interface.idl		\
 	$(oaf_DATA)				\
-	run-nautilus				\
 	$(ui_DATA)				\
+	$(ui_msgs)				\
+	check-nautilus				\
+	nautilus-shell-interface.idl		\
+	run-nautilus				\
 	$(NULL)
 
-BUILT_SOURCES = $(nautilus_shell_interface_idl_sources) \
-		$(ui_msgs)				\
-		$(NULL)
+BUILT_SOURCES = \
+	$(nautilus_shell_interface_idl_sources) \
+	$(ui_msgs)				\
+	$(NULL)
 
 install-data-hook: run-nautilus
 	$(mkinstalldirs) $(DESTDIR)/$(prefix)/bin
diff --git a/src/file-manager/Makefile.am b/src/file-manager/Makefile.am
index fe2f278e5..b56006fde 100644
--- a/src/file-manager/Makefile.am
+++ b/src/file-manager/Makefile.am
@@ -57,7 +57,5 @@ ui_msgs = nautilus-directory-view-ui.xml.h	\
 	$(NULL)
 
 EXTRA_DIST = $(ui_DATA) $(ui_msgs)
-
 CLEANFILES = $(ui_msgs)
-
 BUILT_SOURCES = $(ui_msgs)
diff --git a/src/nautilus-window-manage-views.c b/src/nautilus-window-manage-views.c
index 68722f855..2bb476c14 100644
--- a/src/nautilus-window-manage-views.c
+++ b/src/nautilus-window-manage-views.c
@@ -1183,6 +1183,9 @@ position_and_show_window_callback (NautilusFile *file,
 	}
 
 	gtk_widget_show (GTK_WIDGET (window));
+
+        /* This object was ref'd when starting the callback. */
+        nautilus_file_unref (file);
 }                       			     
 
 static void
@@ -1226,7 +1229,6 @@ nautilus_window_end_location_change_callback (NautilusNavigationResult result_co
                                                        window);
                         g_list_free (attributes);
 
-                        nautilus_file_unref (file);
                         g_free (location);
                 }