rpms/xautolock/F-8 xautolock-2.2-XSS-fix.patch, NONE, 1.1 xautolock.spec, 1.1, 1.2

[Ian Weller (ianweller)]

Author: ianweller

Update of /cvs/pkgs/rpms/xautolock/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12866/F-8

Modified Files:
	xautolock.spec 
Added Files:
	xautolock-2.2-XSS-fix.patch 
Log Message:
Update to 2.2-5

xautolock-2.2-XSS-fix.patch:

--- NEW FILE xautolock-2.2-XSS-fix.patch ---
diff -up xautolock-2.2/src/engine.c.XSS-fix xautolock-2.2/src/engine.c
--- xautolock-2.2/src/engine.c.XSS-fix	2007-12-28 18:15:26.000000000 +0100
+++ xautolock-2.2/src/engine.c	2008-03-17 14:24:16.000000000 +0100
@@ -46,6 +46,8 @@ queryIdleTime (Display* d, Bool use_xidl
     if (!mitInfo) mitInfo = XScreenSaverAllocInfo ();
     XScreenSaverQueryInfo (d, DefaultRootWindow (d), mitInfo);
     idleTime = mitInfo->idle;
+    if (mitInfo->state == ScreenSaverDisabled)
+	idleTime = 0;
 #endif /* HasScreenSaver */
   }
 


Index: xautolock.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xautolock/F-8/xautolock.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xautolock.spec	5 Feb 2008 04:41:05 -0000	1.1
+++ xautolock.spec	18 Mar 2008 16:46:21 -0000	1.2
@@ -1,12 +1,13 @@
 Name:           xautolock
 Version:        2.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Launches a program when your X session has been idle
 
 Group:          User Interface/X
 License:        GPLv2
 URL:            http://freshmeat.net/projects/xautolock/
 Source0:        http://www.ibiblio.org/pub/Linux/X11/screensavers/%{name}-%{version}.tgz
+Patch0:         xautolock-2.2-XSS-fix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  imake libXScrnSaver-devel
@@ -17,6 +18,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .XSS-fix
 xmkmf
 
 
@@ -41,6 +43,9 @@
 
 
 %changelog
+* Mon Mar 17 2008 Thomas Woerner <twoerner at redhat.com> 2.2-5
+- honor XScreenSaver disabled state
+
 * Sun Feb 03 2008 Ian Weller <ianweller at gmail.com> 2.2-4
 - Fixed dates in changelog (2007 -> 2008)
 - Fixed grouping