From 55ce42dad100465d08012e987bc5cd7d74629019 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Thu, 17 Dec 1998 16:13:20 +0000 Subject: [PATCH] Use setlocale (LC_ALL, NULL), not (LC_ALL, "") to query current locale. Thu Dec 17 11:00:48 1998 Owen Taylor * gdk/gdkim.c (gdk_set_locale): Use setlocale (LC_ALL, NULL), not (LC_ALL, "") to query current locale. (Pointed out by Ullrich Hafner ) --- ChangeLog | 1 - ChangeLog.pre-2-0 | 1 - ChangeLog.pre-2-10 | 1 - ChangeLog.pre-2-2 | 1 - ChangeLog.pre-2-4 | 1 - ChangeLog.pre-2-6 | 1 - ChangeLog.pre-2-8 | 1 - gdk/gdkim.c | 4 ++-- gdk/x11/gdkim-x11.c | 4 ++-- 9 files changed, 4 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 04dfb90920..6261220e9c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -37,7 +37,6 @@ Wed Dec 16 22:38:22 CST 1998 Shawn T. Amundson * gdk/gdkevents.c: updated call to g_main_add_poll instead of g_main_poll_add ->>>>>>> 1.848 Wed Dec 16 23:32:05 1998 Owen Taylor * gtk/gtklabel.c (gtk_label_expose): Remove diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 04dfb90920..6261220e9c 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -37,7 +37,6 @@ Wed Dec 16 22:38:22 CST 1998 Shawn T. Amundson * gdk/gdkevents.c: updated call to g_main_add_poll instead of g_main_poll_add ->>>>>>> 1.848 Wed Dec 16 23:32:05 1998 Owen Taylor * gtk/gtklabel.c (gtk_label_expose): Remove diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 04dfb90920..6261220e9c 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -37,7 +37,6 @@ Wed Dec 16 22:38:22 CST 1998 Shawn T. Amundson * gdk/gdkevents.c: updated call to g_main_add_poll instead of g_main_poll_add ->>>>>>> 1.848 Wed Dec 16 23:32:05 1998 Owen Taylor * gtk/gtklabel.c (gtk_label_expose): Remove diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 04dfb90920..6261220e9c 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -37,7 +37,6 @@ Wed Dec 16 22:38:22 CST 1998 Shawn T. Amundson * gdk/gdkevents.c: updated call to g_main_add_poll instead of g_main_poll_add ->>>>>>> 1.848 Wed Dec 16 23:32:05 1998 Owen Taylor * gtk/gtklabel.c (gtk_label_expose): Remove diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 04dfb90920..6261220e9c 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -37,7 +37,6 @@ Wed Dec 16 22:38:22 CST 1998 Shawn T. Amundson * gdk/gdkevents.c: updated call to g_main_add_poll instead of g_main_poll_add ->>>>>>> 1.848 Wed Dec 16 23:32:05 1998 Owen Taylor * gtk/gtklabel.c (gtk_label_expose): Remove diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 04dfb90920..6261220e9c 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -37,7 +37,6 @@ Wed Dec 16 22:38:22 CST 1998 Shawn T. Amundson * gdk/gdkevents.c: updated call to g_main_add_poll instead of g_main_poll_add ->>>>>>> 1.848 Wed Dec 16 23:32:05 1998 Owen Taylor * gtk/gtklabel.c (gtk_label_expose): Remove diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 04dfb90920..6261220e9c 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -37,7 +37,6 @@ Wed Dec 16 22:38:22 CST 1998 Shawn T. Amundson * gdk/gdkevents.c: updated call to g_main_add_poll instead of g_main_poll_add ->>>>>>> 1.848 Wed Dec 16 23:32:05 1998 Owen Taylor * gtk/gtklabel.c (gtk_label_expose): Remove 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