diff options
| author | Brian Cameron <brian.cameron@sun.com> | 2007-11-21 19:10:11 +0000 |
|---|---|---|
| committer | Brian Cameron <bcameron@src.gnome.org> | 2007-11-21 19:10:11 +0000 |
| commit | b9b92dcbe58605395cff52d02076f27793cec1ca (patch) | |
| tree | 09cb0b2f257ac856ca42b1677ebdcbd8b432b94f | |
| parent | f2ac5b9ea1b3acbb5b21efa14e3d892c0b2bf57b (diff) | |
| download | gdm-b9b92dcbe58605395cff52d02076f27793cec1ca.tar.gz | |
Fix so that we allow setting of LC_CTYPE without setting LANG. Cleanup of
2007-11-21 Brian Cameron <brian.cameron@sun.com>
* daemon/gdm.c, daemon/slave.c: Fix so that we allow setting of
LC_CTYPE without setting LANG. Cleanup of how we set the
system locale. Fixes bug #485852. Patch by Sjoerd Simons
<sjoerd@luon.net> and Takao Fujiwara <Takao.Fujiwara@sun.com>.
svn path=/branches/gnome-2-20/; revision=5519
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | daemon/gdm.c | 4 | ||||
| -rw-r--r-- | daemon/slave.c | 2 |
3 files changed, 8 insertions, 5 deletions
@@ -1,3 +1,10 @@ +2007-11-21 Brian Cameron <brian.cameron@sun.com> + + * daemon/gdm.c, daemon/slave.c: Fix so that we allow setting of + LC_CTYPE without setting LANG. Cleanup of how we set the + system locale. Fixes bug #485852. Patch by Sjoerd Simons + <sjoerd@luon.net> and Takao Fujiwara <Takao.Fujiwara@sun.com>. + 2007-11-16 Brian Cameron <brian.cameron@sun.com> * daemon/misc.c: Add back hinting, with a preference towards diff --git a/daemon/gdm.c b/daemon/gdm.c index 65175cc6..ccc7bb13 100644 --- a/daemon/gdm.c +++ b/daemon/gdm.c @@ -1585,9 +1585,7 @@ main (int argc, char *argv[]) main_loop = g_main_loop_new (NULL, FALSE); - if (setlocale (LC_CTYPE, NULL) != NULL) { - gdm_system_locale = g_strdup (setlocale (LC_CTYPE, NULL)); - } + gdm_system_locale = g_strdup (g_get_language_names()[0]); /* initial TERM/INT handler */ sig.sa_handler = initial_term_int; sig.sa_flags = SA_RESTART; diff --git a/daemon/slave.c b/daemon/slave.c index 459aeb88..2543ade5 100644 --- a/daemon/slave.c +++ b/daemon/slave.c @@ -5545,10 +5545,8 @@ check_for_interruption (const char *msg) case GDM_INTERRUPT_SELECT_LANG: if (msg + 2) { const char *locale; - const char *gdm_system_locale; locale = (gchar*)(msg + 3); - gdm_system_locale = setlocale (LC_CTYPE, NULL); always_restart_greeter = (gboolean)(*(msg + 2)); ve_clearenv (); |