rpms/gnome-screensaver/devel gnome-screensaver-2.18.0-require-mouse-grab.patch, NONE, 1.1 gnome-screensaver.spec, 1.144, 1.145

[fedora-cvs-commits at redhat.com]

Author: rstrode

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

Modified Files:
	gnome-screensaver.spec 
Added Files:
	gnome-screensaver-2.18.0-require-mouse-grab.patch 
Log Message:
- require mouse grab to lock screensaver (bug 197452)


gnome-screensaver-2.18.0-require-mouse-grab.patch:
 gs-grab-x11.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE gnome-screensaver-2.18.0-require-mouse-grab.patch ---
--- gnome-screensaver-2.18.0/src/gs-grab-x11.c.require-mouse-grab	2007-04-02 13:15:56.000000000 -0400
+++ gnome-screensaver-2.18.0/src/gs-grab-x11.c	2007-04-02 13:15:59.000000000 -0400
@@ -452,17 +452,17 @@
 #endif
 
         /* When should we allow blanking to proceed?  The current theory
-           is that a keyboard grab is manditory; a mouse grab is optional.
+           is that both a keyboard grab and a mouse grab are mandatory
 
            - If we don't have a keyboard grab, then we won't be able to
            read a password to unlock, so the kbd grab is manditory.
 
            - If we don't have a mouse grab, then we might not see mouse
-           clicks as a signal to unblank -- but we will still see kbd
-           activity, so that's not a disaster.
+           clicks as a signal to unblank, on-screen widgets won't work ideally,
+           and gs_grab_move_to_window() will spin forever when it gets called.
         */
 
-        if (kstatus != GDK_GRAB_SUCCESS) {
+        if (kstatus != GDK_GRAB_SUCCESS || mstatus != GDK_GRAB_SUCCESS) {
                 /* Do not blank without a kbd grab.   */
                 return FALSE;
         }


Index: gnome-screensaver.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -r1.144 -r1.145
--- gnome-screensaver.spec	2 Apr 2007 14:32:19 -0000	1.144
+++ gnome-screensaver.spec	2 Apr 2007 17:24:46 -0000	1.145
@@ -13,7 +13,7 @@
 Summary: GNOME Screensaver
 Name: gnome-screensaver
 Version: 2.18.0
-Release: 4%{?dist} 
+Release: 5%{?dist} 
 License: GPL
 Group: Amusements/Graphics
 Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-screensaver/2.18/%{name}-%{version}.tar.bz2
@@ -23,6 +23,7 @@
 Patch2: gnome-screensaver-2.18.0-securitytoken.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=424737
 Patch3: gnome-screensaver-2.18.0-user-dirs.patch
+Patch4: gnome-screensaver-2.18.0-require-mouse-grab.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 URL: http://www.gnome.org
@@ -67,6 +68,7 @@
 %patch1 -p1 -b .use-floaters-by-default
 %patch2 -p1 -b .securitytoken
 %patch3 -p1 -b .user-dirs
+%patch4 -p1 -b .require-mouse-grab
 
 %build
 autoreconf
@@ -123,6 +125,9 @@
 %{_sysconfdir}/pam.d/*
 
 %changelog
+* Mon Apr  2 2007 Ray Strode <rstrode at redhat.com> - 2.18.0-5
+- require mouse grab to lock screensaver (bug 197452)
+
 * Mon Apr  2 2007 Matthias Clasen <mclasen at redhat.com> - 2.18.0-4
 - Remove the hardwired /etc/skel/Pictures, since we are
   now using xdg-user-dirs