Comment out call to gnome_canvas_set_dither because it no longer serves a

	* libnautilus-extensions/nautilus-background-canvas-group.c:
	Comment out call to gnome_canvas_set_dither because it no
	longer serves a useful purpose and it removes our dependancy
	on using a gnome-libs > 1.2.8 - bug 7922.

	(nautilus_background_canvas_group_initialize_common):
	* libnautilus-extensions/nautilus-background.c:
	(nautilus_background_destroy):
	* libnautilus-extensions/nautilus-background.h:
	* libnautilus-extensions/nautilus-directory-background.c:
	(theme_image_path_to_uri),
	(nautilus_file_background_get_default_settings_for_theme),
	(nautilus_file_background_get_default_settings),
	(nautilus_file_background_read_desktop_settings),
	(nautilus_file_background_write_desktop_settings),
	(nautilus_file_background_write_desktop_default_settings),
	(nautilus_file_background_matches_default_settings),
	(nautilus_file_background_is_set), (background_changed_callback),
	(initialize_background_from_settings):
	* src/nautilus-sidebar.c: (background_settings_changed_callback),
	(nautilus_sidebar_update_appearance):
	Remove combine mode from nautilus-background. It no longer serves
	any purpose (background always draw dithered now) - bug 2190 & 5516.

2 files changed, 0 insertions, 44 deletions

diff --git a/src/nautilus-information-panel.c b/src/nautilus-information-panel.c
index 84ad4790d..31c066209 100644
--- a/src/nautilus-information-panel.c
+++ b/src/nautilus-information-panel.c
@@ -1112,18 +1112,6 @@ background_settings_changed_callback (NautilusBackground *background, NautilusSi
 				    NAUTILUS_METADATA_KEY_SIDEBAR_BACKGROUND_IMAGE,
 				    NULL,
 				    image);
-				    
-	/* Block so this fn is not reinvoked due to nautilus_background_set_combine_mode */
-	gtk_signal_handler_block_by_func (GTK_OBJECT (background),
-					  background_settings_changed_callback,
-					  sidebar);
-	/* Combine mode uses dithering to avoid striations in gradients.
-	 */
-	nautilus_background_set_combine_mode (background, nautilus_gradient_is_gradient (color));
-	
-	gtk_signal_handler_unblock_by_func (GTK_OBJECT (background),
-					    background_settings_changed_callback,
-					    sidebar);
 
 	g_free (color);
 	g_free (image);
@@ -1455,7 +1443,6 @@ nautilus_sidebar_update_appearance (NautilusSidebar *sidebar)
 	char *color_spec;
 	char *background_color;
 	char *background_image;
-	gboolean combine;
 
 	g_return_if_fail (NAUTILUS_IS_SIDEBAR (sidebar));
 	
@@ -1476,12 +1463,8 @@ nautilus_sidebar_update_appearance (NautilusSidebar *sidebar)
 	/* Set up the background color and image from the metadata. */
 
 	if (nautilus_sidebar_background_is_default (sidebar)) {
-		char* combine_str;
 		background_color = g_strdup (sidebar->details->default_background_color);
 		background_image = g_strdup (sidebar->details->default_background_image);
-		combine_str = nautilus_theme_get_theme_data ("sidebar", "combine");
-		combine = combine_str != NULL;
-		g_free (combine_str);
 	} else {
 		background_color = nautilus_file_get_metadata (sidebar->details->file,
 							       NAUTILUS_METADATA_KEY_SIDEBAR_BACKGROUND_COLOR,
@@ -1489,10 +1472,6 @@ nautilus_sidebar_update_appearance (NautilusSidebar *sidebar)
 		background_image = nautilus_file_get_metadata (sidebar->details->file,
 							       NAUTILUS_METADATA_KEY_SIDEBAR_BACKGROUND_IMAGE,
 							       NULL);
-		       
-		/* Combine mode uses dithering to avoid striations in gradients.
-		 */
-		combine = nautilus_gradient_is_gradient (background_color);
 	}
 		
 	/* Block so we don't write these settings out in response to our set calls below */
@@ -1502,7 +1481,6 @@ nautilus_sidebar_update_appearance (NautilusSidebar *sidebar)
 
 	nautilus_background_set_image_uri (background, background_image);
 	nautilus_background_set_color (background, background_color);
-	nautilus_background_set_combine_mode (background, combine);
 
 	g_free (background_color);
 	g_free (background_image);
diff --git a/src/nautilus-sidebar.c b/src/nautilus-sidebar.c
index 84ad4790d..31c066209 100644
--- a/src/nautilus-sidebar.c
+++ b/src/nautilus-sidebar.c
@@ -1112,18 +1112,6 @@ background_settings_changed_callback (NautilusBackground *background, NautilusSi
 				    NAUTILUS_METADATA_KEY_SIDEBAR_BACKGROUND_IMAGE,
 				    NULL,
 				    image);
-				    
-	/* Block so this fn is not reinvoked due to nautilus_background_set_combine_mode */
-	gtk_signal_handler_block_by_func (GTK_OBJECT (background),
-					  background_settings_changed_callback,
-					  sidebar);
-	/* Combine mode uses dithering to avoid striations in gradients.
-	 */
-	nautilus_background_set_combine_mode (background, nautilus_gradient_is_gradient (color));
-	
-	gtk_signal_handler_unblock_by_func (GTK_OBJECT (background),
-					    background_settings_changed_callback,
-					    sidebar);
 
 	g_free (color);
 	g_free (image);
@@ -1455,7 +1443,6 @@ nautilus_sidebar_update_appearance (NautilusSidebar *sidebar)
 	char *color_spec;
 	char *background_color;
 	char *background_image;
-	gboolean combine;
 
 	g_return_if_fail (NAUTILUS_IS_SIDEBAR (sidebar));
 	
@@ -1476,12 +1463,8 @@ nautilus_sidebar_update_appearance (NautilusSidebar *sidebar)
 	/* Set up the background color and image from the metadata. */
 
 	if (nautilus_sidebar_background_is_default (sidebar)) {
-		char* combine_str;
 		background_color = g_strdup (sidebar->details->default_background_color);
 		background_image = g_strdup (sidebar->details->default_background_image);
-		combine_str = nautilus_theme_get_theme_data ("sidebar", "combine");
-		combine = combine_str != NULL;
-		g_free (combine_str);
 	} else {
 		background_color = nautilus_file_get_metadata (sidebar->details->file,
 							       NAUTILUS_METADATA_KEY_SIDEBAR_BACKGROUND_COLOR,
@@ -1489,10 +1472,6 @@ nautilus_sidebar_update_appearance (NautilusSidebar *sidebar)
 		background_image = nautilus_file_get_metadata (sidebar->details->file,
 							       NAUTILUS_METADATA_KEY_SIDEBAR_BACKGROUND_IMAGE,
 							       NULL);
-		       
-		/* Combine mode uses dithering to avoid striations in gradients.
-		 */
-		combine = nautilus_gradient_is_gradient (background_color);
 	}
 		
 	/* Block so we don't write these settings out in response to our set calls below */
@@ -1502,7 +1481,6 @@ nautilus_sidebar_update_appearance (NautilusSidebar *sidebar)
 
 	nautilus_background_set_image_uri (background, background_image);
 	nautilus_background_set_color (background, background_color);
-	nautilus_background_set_combine_mode (background, combine);
 
 	g_free (background_color);
 	g_free (background_image);