From 0806784922c0abe2cf2a284bfd6cf4e13e275cce Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@fedoraproject.org>
Date: Fri, 4 Aug 2006 18:50:03 +0000
Subject: [PATCH] 2.15.90

---
 nautilus-2.15.90-background.patch | 68 +++++++++++++++++++++++++++++++
 nautilus.spec                     |  2 +
 2 files changed, 70 insertions(+)
 create mode 100644 nautilus-2.15.90-background.patch

diff --git a/nautilus-2.15.90-background.patch b/nautilus-2.15.90-background.patch
new file mode 100644
index 0000000..792ed87
--- /dev/null
+++ b/nautilus-2.15.90-background.patch
@@ -0,0 +1,68 @@
+--- nautilus-2.15.90/libnautilus-private/nautilus-directory-background.c.wallpaper	2006-08-04 11:38:13.000000000 -0400
++++ nautilus-2.15.90/libnautilus-private/nautilus-directory-background.c	2006-08-04 12:19:02.000000000 -0400
+@@ -442,14 +442,13 @@
+ 	g_free (image);
+ }
+ 
+-static gboolean
++static void
+ initialize_background_from_settings (NautilusFile *file,
+ 				     EelBackground *background)
+ {
+         char *color, *old_color;
+         char *image, *old_image;
+ 	EelBackgroundImagePlacement placement, old_placement;
+-        gboolean changed;
+ 	
+         g_assert (NAUTILUS_IS_FILE (file));
+         g_assert (EEL_IS_BACKGROUND (background));
+@@ -482,33 +481,14 @@
+                  G_CALLBACK (background_changed_callback),
+                  file);
+ 
+-
+-        changed = FALSE;
+-        
+-        old_color = eel_background_get_color (background);
+-        if (eel_strcmp (color, old_color) != 0) {
+-                eel_background_set_color (background, color);
+-                changed = TRUE;
+-        }
+-        g_free (old_color);
+-
+-        old_image = eel_background_get_image_uri (background);
+-        if (eel_strcmp (image, old_image) != 0) {
+-                if (eel_background_is_desktop(background)) {
+-                        eel_background_set_image_uri_sync (background, image);
+-                }
+-                else {
+-                        eel_background_set_image_uri (background, image);
+-                }
+-                changed = TRUE;
++        eel_background_set_color (background, color);
++        if (eel_background_is_desktop(background)) {
++                eel_background_set_image_uri_sync (background, image);
+         }
+-        g_free (old_image);
+-        
+-        old_placement = eel_background_get_image_placement (background);
+-        if (old_placement != placement) {
+-                eel_background_set_image_placement (background, placement);
+-                changed = TRUE;
++        else {
++                eel_background_set_image_uri (background, image);
+         }
++        eel_background_set_image_placement (background, placement);
+ 	
+ 	/* Unblock the handler. */
+         g_signal_handlers_unblock_by_func
+@@ -527,8 +507,7 @@
+ saved_settings_changed_callback (NautilusFile *file,
+                                  EelBackground *background)
+ {
+-        gboolean changed;
+-	changed = initialize_background_from_settings (file, background);
++	initialize_background_from_settings (file, background);
+ }
+ 
+ /* handle the theme changing */
diff --git a/nautilus.spec b/nautilus.spec
index c1204c7..d9c4551 100644
--- a/nautilus.spec
+++ b/nautilus.spec
@@ -85,6 +85,7 @@ Obsoletes:      nautilus-media
 Patch1:         nautilus-2.5.7-rhconfig.patch
 Patch2:         nautilus-2.15.2-format.patch
 Patch3:		background-no-delay.patch
+Patch4:		nautilus-2.15.90-background.patch
 
 %description
 Nautilus integrates access to files, applications, media,
@@ -99,6 +100,7 @@ GNOME desktop project.
 %patch1 -p1 -b .rhconfig
 %patch2 -p1 -b .format
 %patch3 -p1 -b .no-delay
+%patch4 -p1 -b .background
 
 %build