/*

 * Copyright (c) 2005, 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.

 */

Fixes for bugs that cause problems localizing xscreensaver:

6203951 xscreensaver-lock was not properly l10ned

diff --git xscreensaver-5.11/driver/xscreensaver.c xscreensaver-5.11/driver/xscreensaver.c

--- xscreensaver-5.11/driver/xscreensaver.c

+++ xscreensaver-5.11/driver/xscreensaver.c

@@ -144,6 +144,9 @@

 #include <ctype.h>

 #include <X11/Xlib.h>

+#include <locale.h>

+#include <libintl.h>

+

 #include <X11/Xlibint.h>

 #include <X11/Xatom.h>

@@ -1465,6 +1468,15 @@ main (int argc, char **argv)

   struct passwd *spasswd;

   int i;

+#ifdef ENABLE_NLS

+  if (!setlocale (LC_ALL, ""))

+    fprintf (stderr, "locale not supported by C library\n");

+

+  bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);

+  textdomain (GETTEXT_PACKAGE);

+  bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");

+#endif /* ENABLE_NLS */

+

   memset(si, 0, sizeof(*si));

 #ifdef HAVE_XSCREENSAVER_LOCK