[Xfce4-commits] r29522 - in xfconf/trunk: . xfconf-query

[Stephan Arts]

Author: stephan
Date: 2009-02-20 18:57:23 +0000 (Fri, 20 Feb 2009)
New Revision: 29522

Modified:
   xfconf/trunk/configure.ac.in
   xfconf/trunk/xfconf-query/main.c
Log:
Fix Bug #4622, applied patch by Mike Massonnet 
<mike.massonnet at gmail.com>  (with changes)


Modified: xfconf/trunk/configure.ac.in
===================================================================
--- xfconf/trunk/configure.ac.in	2009-02-20 18:04:04 UTC (rev 29521)
+++ xfconf/trunk/configure.ac.in	2009-02-20 18:57:23 UTC (rev 29522)
@@ -40,11 +40,12 @@
 
 dnl check for standard header files
 AC_HEADER_STDC
-AC_CHECK_HEADERS([errno.h fcntl.h  grp.h \
+AC_CHECK_HEADERS([errno.h fcntl.h  grp.h locale.h \
                   signal.h stdlib.h string.h \
                   sys/stat.h sys/time.h sys/types.h sys/wait.h \
                   unistd.h])
-dnl AC_CHECK_FUNCS([fdwalk getdtablesize setsid sysconf])
+dnl AC_CHECK_FUNCS([fdwalk getdtablesize setlocale setsid sysconf])
+AC_CHECK_FUNCS([setlocale])
 
 dnl version information
 XFCONF_VERSION=xfconf_version

Modified: xfconf/trunk/xfconf-query/main.c
===================================================================
--- xfconf/trunk/xfconf-query/main.c	2009-02-20 18:04:04 UTC (rev 29521)
+++ xfconf/trunk/xfconf-query/main.c	2009-02-20 18:57:23 UTC (rev 29522)
@@ -49,14 +49,14 @@
 
 #include <glib.h>
 
-#if defined(GETTEXT_PACKAGE)
-#include <glib/gi18n-lib.h>
-#else
-#include <glib/gi18n.h>
+#include <libxfce4util/libxfce4util.h>
+
+#ifdef ENABLE_NLS
+#ifdef HAVE_LOCALE_H
+#include <locale.h>
 #endif
+#endif
 
-#include <libxfce4util/libxfce4util.h>
-
 #include "xfconf-gvaluefuncs.h"
 #include "xfconf-common-private.h"
 #include "xfconf/xfconf.h"
@@ -256,6 +256,9 @@
     gint fd = -1;
     GOptionContext *context;
 
+#ifdef ENABLE_NLS
+    setlocale (LC_ALL, "");
+#endif
     xfce_textdomain (GETTEXT_PACKAGE, LOCALEDIR, "UTF-8");
 
     g_type_init();