2004-08-20 [colin] 0.9.12cvs66.1
* src/codeconv.c Sync with HEAD 0.9.12cvs66
This commit is contained in:
parent
1493e56e84
commit
9c93ee5bed
4 changed files with 13 additions and 4 deletions
|
@ -1,3 +1,8 @@
|
|||
2004-08-20 [colin] 0.9.12cvs66.1
|
||||
|
||||
* src/codeconv.c
|
||||
Sync with HEAD 0.9.12cvs66
|
||||
|
||||
2004-08-20 [paul]
|
||||
|
||||
* src/plugins/pgpmime/plugin.c
|
||||
|
|
|
@ -121,3 +121,4 @@
|
|||
( cvs diff -u -r 1.9.2.6 -r 1.9.2.7 src/common/defs.h; ) > 0.9.12cvs60.2.patchset
|
||||
( cvs diff -u -r 1.14.2.9 -r 1.14.2.10 src/plugins/trayicon/trayicon.c; ) > 0.9.12cvs60.3.patchset
|
||||
( cvs diff -u -r 1.9.2.5 -r 1.9.2.6 src/common/ssl.c; cvs diff -u -r 1.1.2.1 -r 1.1.2.3 src/plugins/pgpmime/plugin.c; ) > 0.9.12cvs65.1.patchset
|
||||
( cvs diff -u -r 1.65.2.10 -r 1.65.2.11 src/codeconv.c; ) > 0.9.12cvs66.1.patchset
|
||||
|
|
|
@ -11,7 +11,7 @@ MINOR_VERSION=9
|
|||
MICRO_VERSION=12
|
||||
INTERFACE_AGE=0
|
||||
BINARY_AGE=0
|
||||
EXTRA_VERSION=65
|
||||
EXTRA_VERSION=66
|
||||
EXTRA_RELEASE=
|
||||
EXTRA_GTK2_VERSION=.1
|
||||
|
||||
|
|
|
@ -1391,9 +1391,12 @@ const gchar *conv_get_current_locale(void)
|
|||
const gchar *cur_locale;
|
||||
|
||||
cur_locale = g_getenv("LC_ALL");
|
||||
if (!cur_locale) cur_locale = g_getenv("LC_CTYPE");
|
||||
if (!cur_locale) cur_locale = g_getenv("LANG");
|
||||
if (!cur_locale) cur_locale = setlocale(LC_CTYPE, NULL);
|
||||
if (!cur_locale || !strlen(cur_locale))
|
||||
cur_locale = g_getenv("LC_CTYPE");
|
||||
if (!cur_locale || !strlen(cur_locale))
|
||||
cur_locale = g_getenv("LANG");
|
||||
if (!cur_locale || !strlen(cur_locale))
|
||||
cur_locale = setlocale(LC_CTYPE, NULL);
|
||||
|
||||
/* debug_print("current locale: %s\n",
|
||||
cur_locale ? cur_locale : "(none)"); */
|
||||
|
|
Loading…
Reference in a new issue