6610282 On-Screen Keyboard application and desktop shown with out unlocking xscreensaver lock screen
--- a/open-src/app/xscreensaver/Makefile Thu Jan 24 15:59:01 2008 -0800
+++ b/open-src/app/xscreensaver/Makefile Thu Jan 03 10:30:23 2008 -0800
@@ -30,7 +30,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile 1.80 07/11/21
+# @(#)Makefile 1.81 08/01/03
#
PWD:sh=pwd
@@ -77,7 +77,8 @@
bug-6520014.patch \
NULLRootPasswd.patch \
RobustKBGrab.patch \
- bug-6573182.patch
+ bug-6573182.patch \
+ bug-6610282.patch
# Directory created by unpacking source
SOURCE_DIR=$(BUILD_DIR)/xscreensaver-$(XSCREENSAVER_VERS)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/app/xscreensaver/bug-6610282.patch Thu Jan 03 10:30:23 2008 -0800
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, and/or sell copies of the Software, and to permit persons
+ * to whom the Software is furnished to do so, provided that the above
+ * copyright notice(s) and this permission notice appear in all copies of
+ * the Software and that both the above copyright notice(s) and this
+ * permission notice appear in supporting documentation.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+ * OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+ * HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+ * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+ * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Except as contained in this notice, the name of a copyright holder
+ * shall not be used in advertising or otherwise to promote the sale, use
+ * or other dealings in this Software without prior written authorization
+ * of the copyright holder.
+ *
+ */
+
+--- driver/xscreensaver.c 2007-12-03 10:33:07.846979000 -0800
++++ driver~/xscreensaver.c 2007-12-03 10:38:10.605600000 -0800
+@@ -369,8 +369,14 @@ saver_ehandler (Display *dpy, XErrorEven
+ fprintf (real_stderr,
+ "#######################################"
+ "#######################################\n\n");
+-
+- saver_exit (si, -1, 0);
++/**
++- 6610282(P1) On-Screen Keyboard application and desktop shown
++ with out unlocking xscreensaver lock screen
++ The screen is still locked and it needs to cover all conditions,
++ including AT serverices, such as GOK, only GOK-COMPOSE should
++ be supported(others should not), there is no need to invoke
++ saver_exit (si, -1, 0);
++**/
+ }
+ }