rpms/kdebase-workspace/F-9 kdebase-workspace-4.0.5-screensaver-xautolock.patch, NONE, 1.1 kdebase-workspace.spec, 1.88, 1.89

[Lukas Tinkl (ltinkl)]

Author: ltinkl

Update of /cvs/extras/rpms/kdebase-workspace/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5673

Modified Files:
	kdebase-workspace.spec 
Added Files:
	kdebase-workspace-4.0.5-screensaver-xautolock.patch 
Log Message:
fix screensaver idle detection


kdebase-workspace-4.0.5-screensaver-xautolock.patch:

--- NEW FILE kdebase-workspace-4.0.5-screensaver-xautolock.patch ---
--- krunner/xautolock.cpp	2008/06/19 20:57:46	822344
+++ krunner/xautolock.cpp	2008/06/19 20:57:48	822345
@@ -150,7 +150,6 @@
 {
     mLastReset = time( 0 );
     mTrigger = mLastReset + mTimeout;
-    XForceScreenSaver( QX11Info::display(), ScreenSaverReset );
 }
 
 //---------------------------------------------------------------------------
@@ -234,6 +233,9 @@
     if(!on && mDPMS) {
         activate = false;
         resetTrigger();
+#ifdef HAVE_XSCREENSAVER
+        XForceScreenSaver( QX11Info::display(), ScreenSaverReset );
+#endif
     }
 #endif
 


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/F-9/kdebase-workspace.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- kdebase-workspace.spec	17 Jun 2008 13:15:35 -0000	1.88
+++ kdebase-workspace.spec	20 Jun 2008 13:32:21 -0000	1.89
@@ -6,7 +6,7 @@
 Name: kdebase-workspace
 Version: 4.0.5
 
-Release: 2%{?dist}
+Release: 3%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -30,6 +30,9 @@
 Patch12: kdebase-workspace-4.0.5-kwin-compositing.patch
 #Â kdebug:161342 make per-window shortcut not crash and make it work
 Patch13: kdebase-workspace-4.0.5-kwin-shortcuts.patch
+# http://websvn.kde.org/?view=rev&revision=822345
+#Â fix screensaver idle detection
+Patch14: kdebase-workspace-4.0.5-screensaver-xautolock.patch
 
 # upstream patches:
 # http://bugs.kde.org/155362 (show Name in addition to GenericName in simple menu)
@@ -168,6 +171,7 @@
 %patch11 -p0 -b .plasma-xinerama
 %patch12 -p0 -b .kwin-compositing
 %patch13 -p0 -b .kwin-shortcuts
+%patch14 -p0 -b .screensaver-xautolock
 
 # upstream patches
 %patch101 -p1 -b .menu-switch
@@ -301,6 +305,9 @@
 
 
 %changelog
+* Fri Jun 20 2008 Lukáš Tinkl <ltinkl at redhat.com>
+- fix screensaver idle detection
+
 * Mon Jun 16 2008 Lukáš Tinkl <ltinkl at redhat.com> - 4.0.5-2
 - KWin on maximize doesn't respect the panel size with 2 monitors (kdebug#163146)
 - fix disappearing windows with KWin compositing on