From 9c93ee5bed84b4af071511bacebb59966a564474 Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Fri, 20 Aug 2004 14:38:54 +0000 Subject: [PATCH] 2004-08-20 [colin] 0.9.12cvs66.1 * src/codeconv.c Sync with HEAD 0.9.12cvs66 --- ChangeLog-gtk2.claws | 5 +++++ PATCHSETS | 1 + configure.ac | 2 +- src/codeconv.c | 9 ++++++--- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws index 713fd4fd6..4a5c150ff 100644 --- a/ChangeLog-gtk2.claws +++ b/ChangeLog-gtk2.claws @@ -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 diff --git a/PATCHSETS b/PATCHSETS index ea444d3d8..8525d6b8b 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -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 diff --git a/configure.ac b/configure.ac index cdcc892c4..0e6d22508 100644 --- a/configure.ac +++ b/configure.ac @@ -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 diff --git a/src/codeconv.c b/src/codeconv.c index 1c3cd3934..966da7732 100644 --- a/src/codeconv.c +++ b/src/codeconv.c @@ -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)"); */ -- 2.25.1