rpms/gnome-desktop/devel gnome-desktop-2.22.0-future.patch, NONE, 1.1 gnome-desktop.spec, 1.135, 1.136

[Matthias Clasen (mclasen)]

Author: mclasen

Update of /cvs/extras/rpms/gnome-desktop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31836

Modified Files:
	gnome-desktop.spec 
Added Files:
	gnome-desktop-2.22.0-future.patch 
Log Message:
handle slideshow start times in the future correctly


gnome-desktop-2.22.0-future.patch:

--- NEW FILE gnome-desktop-2.22.0-future.patch ---
diff -up gnome-desktop-2.22.0/libgnome-desktop/gnome-bg.c.future gnome-desktop-2.22.0/libgnome-desktop/gnome-bg.c
--- gnome-desktop-2.22.0/libgnome-desktop/gnome-bg.c.future	2008-03-29 21:04:30.000000000 -0400
+++ gnome-desktop-2.22.0/libgnome-desktop/gnome-bg.c	2008-03-29 21:04:51.000000000 -0400
@@ -858,6 +858,9 @@ get_current_slide (SlideShow *show,
 	double elapsed;
 	int i;
 
+	if (delta < 0)
+		delta += show->total_duration;
+
 	elapsed = 0;
 	i = 0;
 	for (list = show->slides->head; list != NULL; list = list->next) {


Index: gnome-desktop.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-desktop/devel/gnome-desktop.spec,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -r1.135 -r1.136
--- gnome-desktop.spec	26 Mar 2008 16:57:24 -0000	1.135
+++ gnome-desktop.spec	30 Mar 2008 01:10:10 -0000	1.136
@@ -12,7 +12,7 @@
 Summary: Package containing code shared among gnome-panel, gnome-session, nautilus, etc
 Name: gnome-desktop
 Version: 2.22.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-desktop/2.22/%{name}-%{version}.tar.bz2
 License: GPLv2+ and LGPLv2+
@@ -23,6 +23,8 @@
 Patch2:   add-randr-12.patch
 Patch4:   multires.patch
 Patch5:   gnome-desktop-2.22.0-mistranslation.patch
+# fixed upstream
+Patch6:   gnome-desktop-2.22.0-future.patch
 
 Requires: redhat-menus
 
@@ -77,6 +79,7 @@
 %patch2 -p1 -b .add-randr-12
 %patch4 -p1 -b .multires
 %patch5 -p1 -b .mistranslation
+%patch6 -p1 -b .future
 
 %build
 autoreconf
@@ -123,6 +126,9 @@
 %doc %{_datadir}/gtk-doc/html/gnome-desktop/
 
 %changelog
+* Sat Mar 29 2008 Matthias Clasen <mclasen at redhat.com> - 2.22.0-4
+- Handle slideshow start times in the future correctly
+
 * Wed Mar 26 2008 Matthias Clasen <mclasen at redhat.com> - 2.22.0-3
 - Fix mistranslations that cause gnome-about to crash 
   in some locales (el, mk)