Roll double-free bug fix from the branch.

	* libnautilus-private/nautilus-directory-async.c:
	(top_left_read_callback): Roll double-free bug fix from the branch.

	* TODO: Some small updates.

	* components/hardware/nautilus-hardware-view.c:
	* data/browser.xml:
	* icons/crux_eggplant/crux_eggplant.xml:
	* icons/crux_teal/crux_teal.xml:
	* icons/default.xml:
	* icons/gnome/gnome.xml:
	* icons/sierra/sierra.xml:
	* icons/tahoe/tahoe.xml:
	* libnautilus-private/nautilus-directory-background.c:
	(nautilus_file_background_write_desktop_settings):
	* libnautilus-private/nautilus-icon-container.c:
	(start_rubberbanding):
	* libnautilus-private/nautilus-icon-text-item.c:
	(fetch_themed_color):
	* src/nautilus-property-browser.c: (add_color_to_browser):
	* src/nautilus-sidebar-tabs.c: (setup_light_text),
	(setup_dark_text), (nautilus_sidebar_tabs_init),
	(nautilus_sidebar_tabs_receive_dropped_color):
	* src/nautilus-sidebar-title.c:
	(nautilus_sidebar_title_select_text_color):
	* src/nautilus-sidebar.c: (receive_dropped_color):
	Changed all rgb:RRRR/GGGG/BBBB to #RRGGBB. We still probably have
	to handle the old format just for old data files.

	* libnautilus-private/.cvsignore:
	nautilus-marshal-guts.h -> nautilus-marshal.h

	* src/file-manager/fm-directory-view.c:
	(update_directory_in_scripts_menu): Add filter so that we don't
	see invisible or backup files in the scripts menu. In the old
	days, gnome-vfs supplied the filtering.

	* src/nautilus-about.c: (nautilus_about_finalize),
	(nautilus_about_instance_init), (nautilus_about_hide),
	(nautilus_about_hide_on_response),
	(nautilus_about_hide_on_delete), (nautilus_about_class_init):
	Get rid of double-destroy problem with about, and fix OK button.

	* src/nautilus-bookmarks-window.c:
	(nautilus_bookmarks_window_response_callback): Fix Done button.
	(create_bookmarks_window): Hook up response callback.
	(on_window_delete_event), (handle_close_accelerator): Get rid of
	save_geometry_and_hide, since hide already does that.

	* src/nautilus-main.c: (main): Add some missing domains for better
	debugging. We should figure out a way to do this without a list of
	domains.

1 files changed, 9 insertions, 5 deletions

diff --git a/TODO b/TODO
index bf65814d5..4c18f0f1f 100644
--- a/TODO
+++ b/TODO
@@ -1,12 +1,16 @@
 For tasks outside the porting effort, we track them as bugs in
 http://bugzilla.gnome.org.
 
-Porting tasks. Some are necessary and some are just cleanup.
-
-- Get EelLabel working and switch back to it on the sidebar.
-- Get rid of all the direct freetype use and switch to using
-  Pango instead.
+- Make closing a window work (Bonobo fix needed).
+- Get embedded controls working (back and forward buttons and throbber).
+- Get list view working.
 - Visit all the destroy and move things into finalize or dispose
   and make them callable twice as appropriate.
 - Change things that use destroy handlers to use weak references
   instead.
+- Figure out why we get NULL font problems in Pango when the progress
+  dialog comes up.
+
+- Get EelLabel working and switch back to it on the sidebar.
+- Get rid of all the direct freetype use and switch to using
+  Pango instead.