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.

6 files changed, 29 insertions, 29 deletions

diff --git a/icons/crux_eggplant/crux_eggplant.xml b/icons/crux_eggplant/crux_eggplant.xml
index f8b343043..f192815e1 100644
--- a/icons/crux_eggplant/crux_eggplant.xml
+++ b/icons/crux_eggplant/crux_eggplant.xml
@@ -4,14 +4,14 @@
   			dark_info_color="0x777777"
   			light_info_color="0xAAAAAA"
   			selection_box_color_rgba="0x71577440"
-  			selection_box_color="rgb:7171/5757/7474" 
-			background_color="rgb:F0F0/F0F0/F0F0"/>
+  			selection_box_color="#715774" 
+			background_color="#F0F0F0"/>
   			
-  <sidebar sidebar_background_color="rgb:8888/6F6F/8D8D-rgb:2525/0C0C/2A2A%90-rgb:0000/0000/0000:h"
+  <sidebar sidebar_background_color="#886F8D-#250C2A%90-#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="./backgrounds/background_pattern.png"/>
diff --git a/icons/crux_teal/crux_teal.xml b/icons/crux_teal/crux_teal.xml
index 31e409a98..e3fc1d51f 100644
--- a/icons/crux_teal/crux_teal.xml
+++ b/icons/crux_teal/crux_teal.xml
@@ -3,13 +3,13 @@
   <directory background_tile_image="./backgrounds/window_pattern.png" dark_info_color="0x777777"
              light_info_color="0xAAAAAA"
              selection_box_color_rgba="0x497B7E40"
-             selection_box_color="rgb:4949/7B7B/7E7E"
-             background_color="rgb:F0F0/F0F0/F0F0"/>
+             selection_box_color="#497B7E"
+             background_color="#F0F0F0"/>
 
-  <sidebar sidebar_background_color="rgb:6666/9999/9999-rgb:0000/3333/3333%90-rgb:0000/0000/0000:h"
+  <sidebar sidebar_background_color="#669999-#003333%90-#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"
+           left_offset="0" shadow_offset="1" text_h_offset="-4" label_color="#FFFFFF"
            tab_font="-*-helvetica-bold-r-normal-*-24-*-*-*-*-*-*-*" />
            
   <desktop background_tile_image="./backgrounds/background_pattern.png" />
diff --git a/icons/default.xml b/icons/default.xml
index c5e242a2a..66ff6f42c 100644
--- a/icons/default.xml
+++ b/icons/default.xml
@@ -3,20 +3,20 @@
 <theme _name="Default" _description="This is the default theme for Nautilus.">
 
   <sidebar sidebar_background_tile_image="./side_bar_image.png"
-           sidebar_background_color="rgb:4747/4A4A/7C7C-rgb:2222/2323/3A3A:h"
+           sidebar_background_color="#474A7C-#22233A:h"
            tab_piece_images="sidebar_tab_pieces" combine="true"
-           left_offset="0" shadow_offset="1" text_h_offset="-4" label_color="rgb:FFFF/FFFF/FFFF"
+           left_offset="0" shadow_offset="1" text_h_offset="-4" label_color="#FFFFFF"
            tab_font="-*-helvetica-bold-r-normal-*-24-*-*-*-*-*-*-*" />
 
- <desktop background_tile_image="patterns/brushed_metal.png" background_color="rgb:F0F0/F0F0/F0F0"/>
+ <desktop background_tile_image="patterns/brushed_metal.png" background_color="#F0F0F0"/>
  
- <directory background_color="rgb:F0F0/F0F0/F0F0"
+ <directory background_color="#F0F0F0"
             selection_box_color_rgba="0x727D974C"
-            selection_box_color="rgb:7222/7DDD/9777"/>
+            selection_box_color="#727D97"/>
 
- <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"/>
   
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"/>
diff --git a/icons/sierra/sierra.xml b/icons/sierra/sierra.xml
index 9615091dd..aaca7b95d 100644
--- a/icons/sierra/sierra.xml
+++ b/icons/sierra/sierra.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <theme _name="Sierra" _description="Uses manila folders and gray-green backgrounds.">
-  <sidebar sidebar_background_tile_image="./green_weave.png" sidebar_background_color="rgb:FFFF/FFFF/FFFF" tab_piece_images="none"/>
-  <directory background_tile_image="./villanova_green.png" background_color="rgb:FFFF/FFFF/FFFF" selection_box_color_rgba="0x70818359" selection_box_color="rgb:7000/8111/8333"/>
-  <desktop background_tile_image="./Sierra_desktop.png" background_color="rgb:FFFF/FFFF/FFFF"/>
+  <sidebar sidebar_background_tile_image="./green_weave.png" sidebar_background_color="#FFFFFF" tab_piece_images="none"/>
+  <directory background_tile_image="./villanova_green.png" background_color="#FFFFFF" selection_box_color_rgba="0x70818359" selection_box_color="#708183"/>
+  <desktop background_tile_image="./Sierra_desktop.png" background_color="#FFFFFF"/>
   <zoom_control number_v_offset="-6" digit_width="6"/>
 </theme>
diff --git a/icons/tahoe/tahoe.xml b/icons/tahoe/tahoe.xml
index 167e34c0b..8bea978eb 100644
--- a/icons/tahoe/tahoe.xml
+++ b/icons/tahoe/tahoe.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <theme _name="Tahoe" _description="This theme uses photo-realistic folders.">
-  <sidebar sidebar_background_tile_image="./bluewall.png" sidebar_background_color="rgb:FFFF/FFFF/FFFF" title_color="rgb:0000/0000/0000" title_shadow_color="rgb:BBBB/BBBB/BBBB" title_info_color="rgb:0000/0000/0000"/>
-  <directory background_tile_image="./blueridge.png" background_color="rgb:FFFF/FFFF/FFFF"/>
-  <desktop background_tile_image="patterns/fleur_de_lis.png" background_color="rgb:FFFF/FFFF/FFFF"/>
+  <sidebar sidebar_background_tile_image="./bluewall.png" sidebar_background_color="#FFFFFF" title_color="#000000" title_shadow_color="#BBBBBB" title_info_color="#000000"/>
+  <directory background_tile_image="./blueridge.png" background_color="#FFFFFF"/>
+  <desktop background_tile_image="patterns/fleur_de_lis.png" background_color="#FFFFFF"/>
   <zoom_control number_v_offset="-6" digit_width="6"/>
 </theme>