Fixed bug 4057 (clicking the back button while opening a huge

	directory often crashes).

	* libnautilus-extensions/nautilus-icon-container.c:
	(nautilus_icon_container_for_each): The function was iterating
	some icons twice. All the icons on the new_icons list are also on
	the icons list.
	(icon_destroy): Also be sure to remove the icon from the new_icons
	list if it happens to be destroyed while still on that list.

	* configure.in:
	* Makefile.shared:
	Got rid of the shared part of the code to generate .xml.h
	files. It's no longer needed since the po directory takes care of
	everything itself.

	* 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:
	Got rid of the per-directory part of the code to generate .xml.h
	files.

	* components/loser/content/nautilus-content-loser-ui.xml.h:
	* components/loser/sidebar/nautilus-sidebar-loser-ui.xml.h:
	* components/mozilla/nautilus-mozilla-ui.xml.h:
	* components/sample/nautilus-sample-content-view-ui.xml.h:
	* components/services/summary/nautilus-view/nautilus-summary-view-ui.xml.h:
	* libnautilus/nautilus-clipboard-ui.xml.h:
	* src/file-manager/nautilus-directory-view-ui.xml.h:
	* src/file-manager/nautilus-icon-view-ui.xml.h:
	* src/file-manager/nautilus-search-list-view-ui.xml.h:
	* src/nautilus-service-ui.xml.h:
	* src/nautilus-shell-ui.xml.h:
	Got rid of the checked-in copies of the .xml.h files. The worst
	part!

2 files changed, 0 insertions, 38 deletions

diff --git a/libnautilus/Makefile.am b/libnautilus/Makefile.am
index 68fc8ca41..b845e1135 100644
--- a/libnautilus/Makefile.am
+++ b/libnautilus/Makefile.am
@@ -75,13 +75,9 @@ uidir = $(datadir)/gnome/ui
 ui_DATA = \
 	nautilus-clipboard-ui.xml	\
 	$(NULL)
-ui_msgs = \
-	nautilus-clipboard-ui.xml.h	\
-	$(NULL)
 
 EXTRA_DIST = \
 	$(ui_DATA)			\
-	$(ui_msgs)			\
 	nautilus-view-component.idl	\
 	nautilus-distributed-undo.idl	\
 	$(NULL)
@@ -89,7 +85,6 @@ EXTRA_DIST = \
 BUILT_SOURCES = \
 	$(nautilus_view_component_idl_sources)		\
 	$(nautilus_distributed_undo_idl_sources)	\
-	$(ui_msgs)					\
 	$(NULL)
 
 CLEANFILES = \
@@ -97,5 +92,4 @@ CLEANFILES = \
 	nautilus_view_component_idl_stamp		\
 	$(nautilus_distributed_undo_idl_sources)	\
 	nautilus_distributed_undo_idl_stamp             \
-	$(ui_msgs)					\
 	$(NULL)
diff --git a/libnautilus/nautilus-clipboard-ui.xml.h b/libnautilus/nautilus-clipboard-ui.xml.h
deleted file mode 100644
index a1cd931bb..000000000
--- a/libnautilus/nautilus-clipboard-ui.xml.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- *  This file is autogenerated from nautilus-clipboard-ui.xml, do not edit
- *
- *  This file contains translatable strings generated by
- * bonobo-ui-extract. Add this file to your project's
- * POTFILES.in. DO NOT compile it as part of your application.
- */
-
-gchar *s = N_("C_lear Text");
-gchar *s = N_("Copy the selected text to the clipboard");
-gchar *s = N_("Cut the selected text to the clipboard");
-gchar *s = N_("Paste the text stored on the clipboard");
-gchar *s = N_("Remove the selected text without putting it on the clipboard");
-gchar *s = N_("_Copy Text");
-gchar *s = N_("_Cut Text");
-gchar *s = N_("_Paste Text");
-gchar *s = N_("C_lear Text");
-gchar *s = N_("Copy the selected text to the clipboard");
-gchar *s = N_("Cut the selected text to the clipboard");
-gchar *s = N_("Paste the text stored on the clipboard");
-gchar *s = N_("Remove the selected text without putting it on the clipboard");
-gchar *s = N_("_Copy Text");
-gchar *s = N_("_Cut Text");
-gchar *s = N_("_Paste Text");
-gchar *s = N_("C_lear Text");
-gchar *s = N_("Copy the selected text to the clipboard");
-gchar *s = N_("Cut the selected text to the clipboard");
-gchar *s = N_("Paste the text stored on the clipboard");
-gchar *s = N_("Remove the selected text without putting it on the clipboard");
-gchar *s = N_("_Copy Text");
-gchar *s = N_("_Cut Text");
-gchar *s = N_("_Paste Text");