/*

 * Copyright (c) 2008, 2010, Oracle and/or its affiliates. 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, sublicense,

 * and/or sell copies of the Software, and to permit persons to whom the

 * Software is furnished to do so, subject to the following conditions:

 *

 * The above copyright notice and this permission notice (including the next

 * paragraph) shall be included in all copies or substantial portions of the

 * Software.

 *

 * 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.  IN NO EVENT SHALL

 * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

 * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER

 * DEALINGS IN THE SOFTWARE.

 */

diff -Nurp -x '*~' -x '*.orig' xscreensaver-5.11/driver/xscreensaver.c xscreensaver-5.11/driver/xscreensaver.c

--- xscreensaver-5.11/driver/xscreensaver.c	2009-05-27 17:24:05.015845000 -0700

+++ xscreensaver-5.11/driver/xscreensaver.c	2009-05-27 17:24:23.108493000 -0700

@@ -421,7 +421,14 @@ saver_ehandler (Display *dpy, XErrorEvent *error)

    "\n"

    "\n");

+/**

+  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 services, such as GOK, only GOK-COMPOSE should

+  be supported(others should not), there is no need to invoke

 	  saver_exit (si, -1, 0);

+**/

 	}

     }