From 27841fa90785e85d9b6521b466a9b918a5f471dd Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Nov 12 2009 23:40:37 +0000 Subject: copy F12 changes --- diff --git a/gnome-desktop.spec b/gnome-desktop.spec index 11c6dc6..26f23ee 100644 --- a/gnome-desktop.spec +++ b/gnome-desktop.spec @@ -12,7 +12,7 @@ Summary: Shared code among gnome-panel, gnome-session, nautilus, etc Name: gnome-desktop Version: 2.28.1 -Release: 4%{?dist} +Release: 5%{?dist} URL: http://www.gnome.org Source0: http://download.gnome.org/sources/gnome-desktop/2.28/%{name}-%{version}.tar.bz2 Patch1: concatenate-edid-descriptors.patch @@ -22,6 +22,8 @@ Patch2: randr-gamma.patch Patch3: ignore-xrandr-badmatch.patch # https://bugzilla.gnome.org/show_bug.cgi?id=147808 Patch4: per-monitor-background.patch +# https://bugzilla.gnome.org/show_bug.cgi?id=601753 +Patch5: slideshow.patch License: GPLv2+ and LGPLv2+ Group: System Environment/Libraries @@ -84,6 +86,7 @@ libgnomedesktop. %patch2 -p1 -b .randr-gamma %patch3 -p1 -b .ignore-xrandr-badmatch %patch4 -p1 -b .per-monitor-background +%patch5 -p1 -b .slideshow %build %configure --with-gnome-distributor="Red Hat, Inc" \ @@ -131,6 +134,9 @@ rm -rf $RPM_BUILD_ROOT %doc %{_datadir}/gtk-doc/html/gnome-desktop/ %changelog +* Thu Nov 12 2009 Matthias Clasen - 2.28.1-5 +- Make slideshows work again (gnome #601753) + * Mon Nov 9 2009 Matthias Clasen - 2.28.1-4 - Draw backgrounds per-monitor (gnome #147808) diff --git a/slideshow.patch b/slideshow.patch new file mode 100644 index 0000000..51ce822 --- /dev/null +++ b/slideshow.patch @@ -0,0 +1,14 @@ +--- gnome-desktop-2.28.1/libgnome-desktop/gnome-bg.c 2009-11-12 18:23:30.393878825 -0500 ++++ hacked/libgnome-desktop/gnome-bg.c 2009-11-12 18:18:32.296606140 -0500 +@@ -309,6 +309,11 @@ + { + bg->transitioned_id = 0; + ++ if (bg->pixbuf_cache) { ++ g_object_unref (bg->pixbuf_cache); ++ bg->pixbuf_cache = NULL; ++ } ++ + g_signal_emit (G_OBJECT (bg), signals[TRANSITIONED], 0); + + return FALSE;