diff options
| author | Tor Lillqvist <tml@iki.fi> | 2003-09-20 23:52:16 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2003-09-20 23:52:16 +0000 |
| commit | 71e847d11c4a94291b8068eeae924a3978cc91c5 (patch) | |
| tree | 86bfedba20cc2c25fb4c34f0f83e9f9be6ce91b4 /gtk/gtkimmulticontext.c | |
| parent | e95ad99afe722788319dd0fcb9f4e7ed9ab6e2e6 (diff) | |
| download | gtk+-71e847d11c4a94291b8068eeae924a3978cc91c5.tar.gz | |
Don't use zip -r on the etc directory, to avoid including editor backup
2003-09-20 Tor Lillqvist <tml@iki.fi>
* gtk-zip.sh.in: Don't use zip -r on the etc directory, to avoid
including editor backup files. List files we want explicitly.
* gtk/gtkmain.c (_gtk_get_lc_ctype): New function. On Unix, just
calls setlocale (LC_CTYPE, NULL). On Windows, looks for the
LC_ALL, LC_CTYPE and LANG environment variables, than calls
g_win32_getlocale().
(gtk_get_default_language): Code snippet moved to above function,
call it.
* gtk/gtkimmulticontext.c (gtk_im_multicontext_get_slave)
* gtk/gtkrc.c (gtk_rc_context_parse_file): Call
_gtk_get_lc_ctype() instead of setlocale().
Diffstat (limited to 'gtk/gtkimmulticontext.c')
| -rw-r--r-- | gtk/gtkimmulticontext.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/gtk/gtkimmulticontext.c b/gtk/gtkimmulticontext.c index 7563682015..6a2e44f301 100644 --- a/gtk/gtkimmulticontext.c +++ b/gtk/gtkimmulticontext.c @@ -24,6 +24,7 @@ #include "gtkimmulticontext.h" #include "gtkimmodule.h" +#include "gtkmain.h" #include "gtkradiomenuitem.h" #include "gtkintl.h" #include "gtkprivate.h" @@ -254,11 +255,9 @@ gtk_im_multicontext_get_slave (GtkIMMulticontext *multicontext) if (!global_context_id) { - const char *locale; - - locale = setlocale (LC_CTYPE, NULL); - + gchar *locale = _gtk_get_lc_ctype (); global_context_id = _gtk_im_module_get_default_context_id (locale); + g_free (locale); } slave = _gtk_im_module_create (global_context_id); |