rpms/gnome-screensaver/devel gnome-screensaver-2.14.0-fix-timeout.patch, NONE, 1.1 gnome-screensaver.spec, 1.64, 1.65

[fedora-cvs-commits at redhat.com]

Author: rstrode

Update of /cvs/dist/rpms/gnome-screensaver/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8939

Modified Files:
	gnome-screensaver.spec 
Added Files:
	gnome-screensaver-2.14.0-fix-timeout.patch 
Log Message:
- don't ignore idle timers after long suspend
  (bug 183668)


gnome-screensaver-2.14.0-fix-timeout.patch:
 gs-watcher-x11.c |    1 +
 1 files changed, 1 insertion(+)

--- NEW FILE gnome-screensaver-2.14.0-fix-timeout.patch ---
--- gnome-screensaver-2.14.0/src/gs-watcher-x11.c.fix-timeout	2006-04-04 00:56:39.000000000 -0400
+++ gnome-screensaver-2.14.0/src/gs-watcher-x11.c	2006-04-04 00:56:48.000000000 -0400
@@ -1323,6 +1323,7 @@ check_for_clock_skew (GSWatcher *watcher
 
                 watcher->priv->emergency_lock = TRUE;
                 maybe_send_signal (watcher);
+                watcher->priv->emergency_lock = FALSE;
         }
 
         watcher->priv->last_wall_clock_time = now;


Index: gnome-screensaver.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- gnome-screensaver.spec	31 Mar 2006 22:29:17 -0000	1.64
+++ gnome-screensaver.spec	4 Apr 2006 05:11:04 -0000	1.65
@@ -14,7 +14,7 @@
 Summary: GNOME Screensaver
 Name: gnome-screensaver
 Version: 2.14.0
-Release: 3
+Release: 4
 License: GPL
 Group: Amusement/Graphics
 Source0: %{name}-%{version}.tar.bz2
@@ -28,6 +28,7 @@
 Patch1: gnome-screensaver-0.0.23-use-floaters-by-default.patch
 Patch2: gnome-screensaver-2.13.91-shrink-em.patch
 Patch3: gnome-screensaver-2.14.0-pass-krb-environment.patch
+Patch4: gnome-screensaver-2.14.0-fix-timeout.patch
 
 BuildRoot: %{_tmppath}/%{name}-root
 URL: http://www.gnome.org
@@ -65,6 +66,7 @@
 %patch1 -p1 -b .use-floaters-by-default
 %patch2 -p1 -b .shrink-em
 %patch3 -p1 -b .pass-krb-environment
+%patch4 -p1 -b .fix-timeout
 
 %build
 intltoolize --force
@@ -164,6 +166,10 @@
 %{_sysconfdir}/pam.d/*
 
 %changelog
+* Tue Apr  4 2006 Ray Strode <rstrode at redhat.com> 2.14.0-4
+- don't ignore idle timers after long suspend
+  (bug 183668)
+
 * Thu Mar 30 2006 Ray Strode <rstrode at redhat.com> 2.14.0-3
 - refresh kerberos credentials when unlocking screen 
   (bug 187341)