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, 7 insertions, 7 deletions

diff --git a/icons/gnome/gnome.xml b/icons/gnome/gnome.xml
index a804c1675..75e6d252b 100644
--- a/icons/gnome/gnome.xml
+++ b/icons/gnome/gnome.xml
@@ -3,21 +3,21 @@
 
   <directory background_tile_image="patterns/gnome.jpg" 
              selection_box_color_rgba="0x00441140"
-             selection_box_color="rgb:8d00/8100/7300"/>
+             selection_box_color="#8d8173"/>
 
-  <sidebar sidebar_background_color="rgb:8d00/8100/7300-rgb:3f00/3700/2e00%80-rgb:0000/0000/0000:h"
+  <sidebar sidebar_background_color="#8d8173-#3f372e%80-#000000:h"
            sidebar_background_tile_image="patterns/.striated.png"
            tab_piece_images="sidebar_tab_pieces" combine="true"
            left_offset="0" shadow_offset="1" text_h_offset="-4"
-           label_color="rgb:FFFF/FFFF/FFFF"
+           label_color="#FFFFFF"
            tab_font="-*-helvetica-bold-r-normal-*-24-*-*-*-*-*-*-*" />
 
   <desktop background_tile_image="patterns/dark-gnome.jpg"
-	   background_color="rgb:F400/F200/e800"/>
+	   background_color="#:F400/F200/e800"/>
 
-  <icon highlight_background_color="rgb:0000/0000/0000" 
-	highlight_text_color="rgb:FFFF/FFFF/FFFF" 
-	text_fill_color="rgb:FFFF/FFFF/FFFF"/>
+  <icon highlight_background_color="#000000" 
+	highlight_text_color="#FFFFFF" 
+	text_fill_color="#FFFFFF"/>
 
   <thumbnails frame_offsets="3,3,6,6"/>
   <toolbar icon_theme="standard"/>