mirror of
https://gitlab.gnome.org/GNOME/gtk.git
synced 2024-11-11 11:20:12 +00:00
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:
parent
eba4c9a85e
commit
55ce42dad1
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user