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>)
This commit is contained in:
Owen Taylor 1998-12-17 16:13:20 +00:00 committed by Owen Taylor
parent eba4c9a85e
commit 55ce42dad1
9 changed files with 4 additions and 11 deletions

View File

@ -37,7 +37,6 @@ Wed Dec 16 22:38:22 CST 1998 Shawn T. Amundson <amundson@gtk.org>
* 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 <otaylor@redhat.com>
* gtk/gtklabel.c (gtk_label_expose): Remove

View File

@ -37,7 +37,6 @@ Wed Dec 16 22:38:22 CST 1998 Shawn T. Amundson <amundson@gtk.org>
* 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 <otaylor@redhat.com>
* gtk/gtklabel.c (gtk_label_expose): Remove

View File

@ -37,7 +37,6 @@ Wed Dec 16 22:38:22 CST 1998 Shawn T. Amundson <amundson@gtk.org>
* 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 <otaylor@redhat.com>
* gtk/gtklabel.c (gtk_label_expose): Remove

View File

@ -37,7 +37,6 @@ Wed Dec 16 22:38:22 CST 1998 Shawn T. Amundson <amundson@gtk.org>
* 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 <otaylor@redhat.com>
* gtk/gtklabel.c (gtk_label_expose): Remove

View File

@ -37,7 +37,6 @@ Wed Dec 16 22:38:22 CST 1998 Shawn T. Amundson <amundson@gtk.org>
* 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 <otaylor@redhat.com>
* gtk/gtklabel.c (gtk_label_expose): Remove

View File

@ -37,7 +37,6 @@ Wed Dec 16 22:38:22 CST 1998 Shawn T. Amundson <amundson@gtk.org>
* 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 <otaylor@redhat.com>
* gtk/gtklabel.c (gtk_label_expose): Remove

View File

@ -37,7 +37,6 @@ Wed Dec 16 22:38:22 CST 1998 Shawn T. Amundson <amundson@gtk.org>
* 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 <otaylor@redhat.com>
* gtk/gtklabel.c (gtk_label_expose): Remove

View File

@ -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

View File

@ -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