rpms/xscreensaver/devel xscreensaver-4.22-allow-zero-dpms-timeout.patch, NONE, 1.1 xscreensaver.spec, 1.65, 1.66

[fedora-cvs-commits at redhat.com]

Author: rstrode

Update of /cvs/dist/rpms/xscreensaver/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10630

Modified Files:
	xscreensaver.spec 
Added Files:
	xscreensaver-4.22-allow-zero-dpms-timeout.patch 
Log Message:
- accept zero timeout values for suspend and off.
  Patch from Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
  (bug 157501). 


xscreensaver-4.22-allow-zero-dpms-timeout.patch:
 prefs.c |   17 +++++++++++++++++
 1 files changed, 17 insertions(+)

--- NEW FILE xscreensaver-4.22-allow-zero-dpms-timeout.patch ---
--- xscreensaver-4.22/driver/prefs.c	2005-09-26 20:42:23.000000000 +0900
+++ xscreensaver-4.22/driver/prefs.c	2005-09-26 20:46:44.000000000 +0900
@@ -1583,8 +1583,25 @@
   /* standby may not be greater than suspend.
      suspend may not be greater than off.
    */
+  /*
   if (p->dpms_standby > p->dpms_suspend) p->dpms_standby = p->dpms_suspend;
   if (p->dpms_suspend > p->dpms_off)     p->dpms_suspend = p->dpms_off;
+  */
+  /* Enable 0 value for suspend and off; see redhat bugzilla 157501.
+     Also, suspend<->off check should be done prior to
+     stanby<->suspend check; switch these.
+  */
+  if (p->dpms_suspend > p->dpms_off && p->dpms_off != 0)     
+    p->dpms_suspend = p->dpms_off;
+  if (p->dpms_standby > p->dpms_suspend && p->dpms_suspend != 0 )
+    p->dpms_standby = p->dpms_suspend;
+
+  /* Ah, two fixes above overlooks the case that
+     suspend=0 and stanby > off ; add this case
+     (Finally, all cases are checked...)
+   */
+  if (p->dpms_standby > p->dpms_off && p->dpms_off != 0)     
+    p->dpms_standby = p->dpms_off;
 
 
   if (p->dpms_standby == 0 &&	   /* if *all* are 0, then DPMS is disabled */


Index: xscreensaver.spec
===================================================================
RCS file: /cvs/dist/rpms/xscreensaver/devel/xscreensaver.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- xscreensaver.spec	23 Sep 2005 21:25:11 -0000	1.65
+++ xscreensaver.spec	28 Sep 2005 14:20:58 -0000	1.66
@@ -4,7 +4,7 @@
 Summary:	X screen saver and locker
 Name:		%{name}
 Version:	%{version}
-Release:	17
+Release:	18
 Epoch:		1
 License:	BSD
 Group:		Amusements/Graphics
@@ -23,6 +23,7 @@
 Patch9:         xscreensaver-4.22-remove-density-option.patch
 Patch10:        xscreensaver-4.22-fix-man-pages.patch
 Patch11:        xscreensaver-4.22-dont-allow-root.patch
+Patch12:        xscreensaver-4.22-allow-zero-dpms-timeout.patch
 Buildroot:	%{_tmppath}/%{name}-root
 
 # find_lang
@@ -86,6 +87,7 @@
 %patch9 -p1 -b .rmeove-density-option
 %patch10 -p1 -b .fix-man-pages
 %patch11 -p1 -b .dont-allow-root
+%patch12 -p1 -b .allow-zero-dpms-timeout
 
 if [ -x %{_datadir}/libtool/config.guess ]; then
   # use system-wide copy
@@ -216,6 +218,11 @@
 %defattr(-,root,root)
 
 %changelog
+* Wed Sep 28 2005 Ray Strode <rstrode at redhat.com> 1:4.22-18
+- accept zero timeout values for suspend and off.
+  Patch from Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+  (bug 157501). 
+
 * Fri Sep 23 2005 Ray Strode <rstrode at redhat.com> 1:4.22-17
 - remove explicit dependency on xscreensaver-base for 
   extras and gl-extras packages