summaryrefslogtreecommitdiff
path: root/gdk
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@redhat.com>1998-12-17 16:13:20 +0000
committerOwen Taylor <otaylor@src.gnome.org>1998-12-17 16:13:20 +0000
commit55ce42dad100465d08012e987bc5cd7d74629019 (patch)
tree3bb380834d0aa1e2d7dc00ffc72c38264b43e0a2 /gdk
parenteba4c9a85e406daee3a70196efbc1a511cd4d45c (diff)
downloadgtk+-55ce42dad100465d08012e987bc5cd7d74629019.tar.gz
Use setlocale (LC_ALL, NULL), not (LC_ALL, "") to query current locale.
Thu Dec 17 11:00:48 1998 Owen Taylor <otaylor@redhat.com> * gdk/gdkim.c (gdk_set_locale): Use setlocale (LC_ALL, NULL), not (LC_ALL, "") to query current locale. (Pointed out by Ullrich Hafner <hafner@informatik.uni-wuerzburg.de>)
Diffstat (limited to 'gdk')
-rw-r--r--gdk/gdkim.c4
-rw-r--r--gdk/x11/gdkim-x11.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/gdk/gdkim.c b/gdk/gdkim.c
index c28ecea88c..182bb3b4e0 100644
--- a/gdk/gdkim.c
+++ b/gdk/gdkim.c
@@ -99,7 +99,7 @@ gdk_set_locale (void)
if (!XSetLocaleModifiers (""))
g_message ("can not set locale modifiers");
- current_locale = setlocale (LC_ALL, "");
+ current_locale = setlocale (LC_ALL, NULL);
if ((strcmp (current_locale, "C")) && (strcmp (current_locale, "POSIX")))
{
@@ -126,7 +126,7 @@ gdk_set_locale (void)
g_message ("%s multi-byte string functions.",
gdk_use_mb ? "Using" : "Not using"));
- return setlocale (LC_ALL,NULL);
+ return current_locale;
}
#ifdef USE_XIM
diff --git a/gdk/x11/gdkim-x11.c b/gdk/x11/gdkim-x11.c
index c28ecea88c..182bb3b4e0 100644
--- a/gdk/x11/gdkim-x11.c
+++ b/gdk/x11/gdkim-x11.c
@@ -99,7 +99,7 @@ gdk_set_locale (void)
if (!XSetLocaleModifiers (""))
g_message ("can not set locale modifiers");
- current_locale = setlocale (LC_ALL, "");
+ current_locale = setlocale (LC_ALL, NULL);
if ((strcmp (current_locale, "C")) && (strcmp (current_locale, "POSIX")))
{
@@ -126,7 +126,7 @@ gdk_set_locale (void)
g_message ("%s multi-byte string functions.",
gdk_use_mb ? "Using" : "Not using"));
- return setlocale (LC_ALL,NULL);
+ return current_locale;
}
#ifdef USE_XIM