From 7ebe35652d7522d8fde121a8e635825453cec49f Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode@fedoraproject.org>
Date: Tue, 20 Jan 2009 02:22:22 +0000
Subject: [PATCH] - Update fade patch to work with updated gnome-desktop api -
 Fix fade start pixmap

---
 eel-2.24.0-fade.patch | 23 ++++++++++++++++++++---
 nautilus.spec         |  6 +++++-
 2 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/eel-2.24.0-fade.patch b/eel-2.24.0-fade.patch
index 9dad8ce..5e2539b 100644
--- a/eel-2.24.0-fade.patch
+++ b/eel-2.24.0-fade.patch
@@ -324,7 +324,7 @@ diff --git a/eel/eel-background.c b/eel/eel-background.c
 +	}
 +
 +	if (!gnome_bg_crossfade_is_started (background->details->fade)) {
-+		gnome_bg_crossfade_start (background->details->fade, window, NULL);
++		gnome_bg_crossfade_start (background->details->fade, window);
 +		if (background->details->is_desktop) {
 +			g_signal_connect_swapped (background->details->fade,
 +					          "finished",
@@ -375,7 +375,7 @@ diff --git a/eel/eel-background.c b/eel/eel-background.c
  		set_root_pixmap (background, window);
  	}
  	
-@@ -720,6 +772,36 @@ on_background_changed (EelBackground *background)
+@@ -720,6 +772,44 @@ on_background_changed (EelBackground *background)
  }
  
  static void
@@ -403,8 +403,16 @@ diff --git a/eel/eel-background.c b/eel/eel-background.c
 +	}
 +
 +	if (background->details->fade != NULL && !gnome_bg_crossfade_is_started (background->details->fade)) {
++		GdkPixmap *start_pixmap;
++
++		if (background->details->background_pixmap == NULL) {
++			start_pixmap = gnome_bg_get_pixmap_from_root (gtk_widget_get_screen (widget));
++		} else {
++			start_pixmap = g_object_ref (background->details->background_pixmap);
++		}
 +		gnome_bg_crossfade_set_start_pixmap (background->details->fade,
-+						     background->details->background_pixmap);
++						     start_pixmap);
++                g_object_unref (start_pixmap);
 +	}
 +}
 +
@@ -412,3 +420,12 @@ diff --git a/eel/eel-background.c b/eel/eel-background.c
  eel_widget_queue_background_change (GtkWidget *widget)
  {
  	EelBackground *background;
+@@ -782,6 +872,8 @@ widget_realized_setup (GtkWidget *widget, gpointer data)
+ 		} else {
+ 			background->details->use_common_pixmap = FALSE;
+ 		}
++
++		init_fade (background, widget);
+ 	}
+ }
+ 
diff --git a/nautilus.spec b/nautilus.spec
index 967df60..a5696e5 100644
--- a/nautilus.spec
+++ b/nautilus.spec
@@ -16,7 +16,7 @@
 Name:		nautilus
 Summary:        File manager for GNOME
 Version: 	2.25.2
-Release:	6%{?dist}
+Release:	7%{?dist}
 License: 	GPLv2+
 Group:          User Interface/Desktops
 Source: 	http://download.gnome.org/sources/%{name}/2.25/%{name}-%{version}.tar.bz2
@@ -265,6 +265,10 @@ fi
 
 
 %changelog
+* Mon Jan 19 2009 Ray Strode <rstrode@redhat.com> - 2.25.2-7
+- Update fade patch to work with updated gnome-desktop api
+- Fix fade start pixmap
+
 * Wed Jan  7 2009 Ray Strode <rstrode@redhat.com> - 2.25.2-6
 - Don't crash when closing spatial window very quickly after
   opening it (gnome bug 552859)