rpms/gnome-screensaver/FC-5 gnome-screensaver-2.14.0-detect-more-user-events.patch, NONE, 1.1 gnome-screensaver-2.14.0-fix-timeout.patch, NONE, 1.1 gnome-screensaver.spec, 1.63, 1.64

[fedora-cvs-commits at redhat.com]

Author: rstrode

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

Modified Files:
	gnome-screensaver.spec 
Added Files:
	gnome-screensaver-2.14.0-detect-more-user-events.patch 
	gnome-screensaver-2.14.0-fix-timeout.patch 
Log Message:
- Don't unconditionally activate every timeout period regardless
  of user activity after long suspends (bug 183668)

- Detect scroll wheel events when pointer isn't moved 
  (upstream bug 335831)


gnome-screensaver-2.14.0-detect-more-user-events.patch:
 gs-watcher-x11.c |    7 +++++++
 1 files changed, 7 insertions(+)

--- NEW FILE gnome-screensaver-2.14.0-detect-more-user-events.patch ---
--- gnome-screensaver-2.14.0/src/gs-watcher-x11.c	30 Mar 2006 16:45:48 -0000	1.34
+++ gnome-screensaver-2.14.0/src/gs-watcher-x11.c	2 Apr 2006 03:52:22 -0000
@@ -317,6 +316,9 @@ notice_events_inner (Window   window,
 
                 /* Select for SubstructureNotify on all windows */
                 events = SubstructureNotifyMask | events;
+
+                /* Select for PropertyNotify events to get user time changes */
+                events = PropertyChangeMask | events;
         } else {
                 /* We want to disable all events */
 
@@ -607,6 +609,10 @@ gs_watcher_xevent (GSWatcher *watcher,
         case ButtonPress:
         case ButtonRelease:
                 _gs_watcher_notice_activity (watcher);
+                break;
+        case PropertyNotify:
+                if (ev->xproperty.atom == gdk_x11_get_xatom_by_name ("_NET_WM_USER_TIME"))
+			_gs_watcher_notice_activity (watcher);
                 break;
         case CreateNotify:
                 {


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/FC-5/gnome-screensaver.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- gnome-screensaver.spec	31 Mar 2006 04:22:42 -0000	1.63
+++ gnome-screensaver.spec	4 Apr 2006 14:06:22 -0000	1.64
@@ -14,7 +14,7 @@
 Summary: GNOME Screensaver
 Name: gnome-screensaver
 Version: 2.14.0
-Release: 1.fc5
+Release: 1.fc5.1
 License: GPL
 Group: Amusement/Graphics
 Source0: %{name}-%{version}.tar.bz2
@@ -28,6 +28,8 @@
 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
+Patch5: gnome-screensaver-2.14.0-detect-more-user-events.patch
 
 BuildRoot: %{_tmppath}/%{name}-root
 URL: http://www.gnome.org
@@ -65,6 +67,8 @@
 %patch1 -p1 -b .use-floaters-by-default
 %patch2 -p1 -b .shrink-em
 %patch3 -p1 -b .pass-krb-environment
+%patch4 -p1 -b .timeout
+%patch5 -p1 -b .detect-more-user-events
 
 %build
 intltoolize --force
@@ -164,6 +168,13 @@
 %{_sysconfdir}/pam.d/*
 
 %changelog
+* Thu Mar 30 2006 Ray Strode <rstrode at redhat.com> 2.14.0-1.fc5.1
+- Don't unconditionally activate every timeout period regardless
+  of user activity after long suspends (bug 183668)
+
+- Detect scroll wheel events when pointer isn't moved 
+  (upstream bug 335831)
+
 * Thu Mar 30 2006 Ray Strode <rstrode at redhat.com> 2.14.0-1.fc5
 - refresh kerberos credentials when unlocking screen 
   (bug 187341)