[svn] gpg-error - r172 - in trunk: . src

[svn author marcus]

Author: marcus
Date: 2006-05-29 16:32:47 +0200 (Mon, 29 May 2006)
New Revision: 172

Modified:
   trunk/ChangeLog
   trunk/src/gpg-error.c
   trunk/src/init.c
Log:
2006-05-29  Marcus Brinkmann  <marcus at g10code.de>

	* src/init.c (gpg_err_init) [!ENABLE_NLS]: Do not initialize the
	locale.
	* src/gpg-error.c (i18n_init) [!ENABLE_NLS]: Likewise.
	Patch submitted by Nils Durner <ndurner at web.de>.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2006-05-25 02:01:08 UTC (rev 171)
+++ trunk/ChangeLog	2006-05-29 14:32:47 UTC (rev 172)
@@ -1,3 +1,10 @@
+2006-05-29  Marcus Brinkmann  <marcus at g10code.de>
+
+	* src/init.c (gpg_err_init) [!ENABLE_NLS]: Do not initialize the
+	locale.
+	* src/gpg-error.c (i18n_init) [!ENABLE_NLS]: Likewise.
+	Patch submitted by Nils Durner <ndurner at web.de>.
+
 2006-05-25  Marcus Brinkmann  <marcus at g10code.de>
 
 	* lang/cl/gpg-error.asd: Renamed to ...

Modified: trunk/src/gpg-error.c
===================================================================
--- trunk/src/gpg-error.c	2006-05-25 02:01:08 UTC (rev 171)
+++ trunk/src/gpg-error.c	2006-05-29 14:32:47 UTC (rev 172)
@@ -64,16 +64,15 @@
 static void
 i18n_init (void)
 {
+#ifdef ENABLE_NLS
   char *locale_dir;
 
-#ifdef ENABLE_NLS
 # ifdef HAVE_LC_MESSAGES
   setlocale (LC_TIME, "");
   setlocale (LC_MESSAGES, "");
 # else
   setlocale (LC_ALL, "" );
 # endif
-#endif
 
   locale_dir = get_locale_dir ();
   if (locale_dir)
@@ -82,6 +81,7 @@
       drop_locale_dir (locale_dir);
     }
   textdomain (PACKAGE);
+#endif
 }
 
 

Modified: trunk/src/init.c
===================================================================
--- trunk/src/init.c	2006-05-25 02:01:08 UTC (rev 171)
+++ trunk/src/init.c	2006-05-29 14:32:47 UTC (rev 172)
@@ -48,6 +48,7 @@
 gpg_error_t
 gpg_err_init (void)
 {
+#ifdef ENABLE_NLS
   char *locale_dir;
 
   /* We only have to bind our locale directory to our text domain.  */
@@ -58,6 +59,7 @@
       bindtextdomain (PACKAGE, locale_dir);
       drop_locale_dir (locale_dir);
     }
+#endif
 
   return 0;
 }