[Commits] [SCM] claws branch, master, updated. 3.16.0-148-g5bbe484

wwp at claws-mail.org wwp at claws-mail.org
Sat May 5 09:36:31 CEST 2018


The branch, master has been updated
       via  5bbe4844657d77cccc842f2e502297942b508377 (commit)
      from  648c1298244e8c2434c6c86fb57d293d6498edd9 (commit)

Summary of changes:
 src/codeconv.c |  332 ++++++++++++++++++++++++++++----------------------------
 src/codeconv.h |    1 +
 2 files changed, 167 insertions(+), 166 deletions(-)


- Log -----------------------------------------------------------------
commit 5bbe4844657d77cccc842f2e502297942b508377
Author: wwp <wwp at free.fr>
Date:   Sat May 5 09:35:11 2018 +0200

    Use a proper CharSet enum value for uninitialized state of static vars,
    reindent tables for increasing readability.

diff --git a/src/codeconv.c b/src/codeconv.c
index 4fb3f69..de939ed 100644
--- a/src/codeconv.c
+++ b/src/codeconv.c
@@ -1081,131 +1081,131 @@ static const struct {
 	CharSet charset;
 	CharSet out_charset;
 } locale_table[] = {
-	{"ja_JP.eucJP"	, C_EUC_JP	, C_ISO_2022_JP},
-	{"ja_JP.EUC-JP"	, C_EUC_JP	, C_ISO_2022_JP},
-	{"ja_JP.EUC"	, C_EUC_JP	, C_ISO_2022_JP},
-	{"ja_JP.ujis"	, C_EUC_JP	, C_ISO_2022_JP},
-	{"ja_JP.SJIS"	, C_SHIFT_JIS	, C_ISO_2022_JP},
-	{"ja_JP.JIS"	, C_ISO_2022_JP	, C_ISO_2022_JP},
+	{"ja_JP.eucJP"		, C_EUC_JP	, C_ISO_2022_JP},
+	{"ja_JP.EUC-JP"		, C_EUC_JP	, C_ISO_2022_JP},
+	{"ja_JP.EUC"		, C_EUC_JP	, C_ISO_2022_JP},
+	{"ja_JP.ujis"		, C_EUC_JP	, C_ISO_2022_JP},
+	{"ja_JP.SJIS"		, C_SHIFT_JIS	, C_ISO_2022_JP},
+	{"ja_JP.JIS"		, C_ISO_2022_JP	, C_ISO_2022_JP},
 #ifdef G_OS_WIN32
-	{"ja_JP"	, C_SHIFT_JIS	, C_ISO_2022_JP},
+	{"ja_JP"		, C_SHIFT_JIS	, C_ISO_2022_JP},
 #else
-	{"ja_JP"	, C_EUC_JP	, C_ISO_2022_JP},
+	{"ja_JP"		, C_EUC_JP	, C_ISO_2022_JP},
 #endif
-	{"ko_KR.EUC-KR"	, C_EUC_KR	, C_EUC_KR},
-	{"ko_KR"	, C_EUC_KR	, C_EUC_KR},
+	{"ko_KR.EUC-KR"		, C_EUC_KR	, C_EUC_KR},
+	{"ko_KR"		, C_EUC_KR	, C_EUC_KR},
 	{"zh_CN.GB18030"	, C_GB18030	, C_GB18030},
-	{"zh_CN.GB2312"	, C_GB2312	, C_GB2312},
-	{"zh_CN.GBK"	, C_GBK		, C_GBK},
-	{"zh_CN"	, C_GB18030	, C_GB18030},
-	{"zh_HK"	, C_BIG5_HKSCS	, C_BIG5_HKSCS},
-	{"zh_TW.eucTW"	, C_EUC_TW	, C_BIG5},
-	{"zh_TW.EUC-TW"	, C_EUC_TW	, C_BIG5},
-	{"zh_TW.Big5"	, C_BIG5	, C_BIG5},
-	{"zh_TW"	, C_BIG5	, C_BIG5},
-
-	{"ru_RU.KOI8-R"	, C_KOI8_R	, C_KOI8_R},
-	{"ru_RU.KOI8R"	, C_KOI8_R	, C_KOI8_R},
-	{"ru_RU.CP1251"	, C_WINDOWS_1251, C_KOI8_R},
+	{"zh_CN.GB2312"		, C_GB2312	, C_GB2312},
+	{"zh_CN.GBK"		, C_GBK		, C_GBK},
+	{"zh_CN"		, C_GB18030	, C_GB18030},
+	{"zh_HK"		, C_BIG5_HKSCS	, C_BIG5_HKSCS},
+	{"zh_TW.eucTW"		, C_EUC_TW	, C_BIG5},
+	{"zh_TW.EUC-TW"		, C_EUC_TW	, C_BIG5},
+	{"zh_TW.Big5"		, C_BIG5	, C_BIG5},
+	{"zh_TW"		, C_BIG5	, C_BIG5},
+
+	{"ru_RU.KOI8-R"		, C_KOI8_R	, C_KOI8_R},
+	{"ru_RU.KOI8R"		, C_KOI8_R	, C_KOI8_R},
+	{"ru_RU.CP1251"		, C_WINDOWS_1251, C_KOI8_R},
 #ifdef G_OS_WIN32
-	{"ru_RU"	, C_WINDOWS_1251, C_KOI8_R},
+	{"ru_RU"		, C_WINDOWS_1251, C_KOI8_R},
 #else
-	{"ru_RU"	, C_ISO_8859_5	, C_KOI8_R},
+	{"ru_RU"		, C_ISO_8859_5	, C_KOI8_R},
 #endif
-	{"tg_TJ"	, C_KOI8_T	, C_KOI8_T},
-	{"ru_UA"	, C_KOI8_U	, C_KOI8_U},
-	{"uk_UA.CP1251"	, C_WINDOWS_1251, C_KOI8_U},
-	{"uk_UA"	, C_KOI8_U	, C_KOI8_U},
-
-	{"be_BY"	, C_WINDOWS_1251, C_WINDOWS_1251},
-	{"bg_BG"	, C_WINDOWS_1251, C_WINDOWS_1251},
-
-	{"yi_US"	, C_WINDOWS_1255, C_WINDOWS_1255},
-
-	{"af_ZA"	, C_ISO_8859_1  , C_ISO_8859_1},
-	{"br_FR"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"ca_ES"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"da_DK"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"de_AT"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"de_BE"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"de_CH"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"de_DE"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"de_LU"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"en_AU"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"en_BW"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"en_CA"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"en_DK"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"en_GB"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"en_HK"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"en_IE"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"en_NZ"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"en_PH"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"en_SG"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"en_US"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"en_ZA"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"en_ZW"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"es_AR"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"es_BO"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"es_CL"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"es_CO"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"es_CR"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"es_DO"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"es_EC"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"es_ES"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"es_GT"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"es_HN"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"es_MX"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"es_NI"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"es_PA"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"es_PE"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"es_PR"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"es_PY"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"es_SV"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"es_US"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"es_UY"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"es_VE"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"et_EE"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"eu_ES"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"fi_FI"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"fo_FO"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"fr_BE"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"fr_CA"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"fr_CH"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"fr_FR"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"fr_LU"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"ga_IE"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"gl_ES"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"gv_GB"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"id_ID"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"is_IS"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"it_CH"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"it_IT"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"kl_GL"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"kw_GB"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"ms_MY"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"nl_BE"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"nl_NL"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"nb_NO"	, C_ISO_8859_1  , C_ISO_8859_1},
-	{"nn_NO"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"no_NO"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"oc_FR"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"pt_BR"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"pt_PT"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"sq_AL"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"sv_FI"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"sv_SE"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"tl_PH"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"uz_UZ"	, C_ISO_8859_1	, C_ISO_8859_1},
-	{"wa_BE"	, C_ISO_8859_1	, C_ISO_8859_1},
-
-	{"bs_BA"	, C_ISO_8859_2	, C_ISO_8859_2},
-	{"cs_CZ"	, C_ISO_8859_2	, C_ISO_8859_2},
-	{"hr_HR"	, C_ISO_8859_2	, C_ISO_8859_2},
-	{"hu_HU"	, C_ISO_8859_2	, C_ISO_8859_2},
-	{"pl_PL"	, C_ISO_8859_2	, C_ISO_8859_2},
-	{"ro_RO"	, C_ISO_8859_2	, C_ISO_8859_2},
-	{"sk_SK"	, C_ISO_8859_2	, C_ISO_8859_2},
-	{"sl_SI"	, C_ISO_8859_2	, C_ISO_8859_2},
+	{"tg_TJ"		, C_KOI8_T	, C_KOI8_T},
+	{"ru_UA"		, C_KOI8_U	, C_KOI8_U},
+	{"uk_UA.CP1251"		, C_WINDOWS_1251, C_KOI8_U},
+	{"uk_UA"		, C_KOI8_U	, C_KOI8_U},
+
+	{"be_BY"		, C_WINDOWS_1251, C_WINDOWS_1251},
+	{"bg_BG"		, C_WINDOWS_1251, C_WINDOWS_1251},
+
+	{"yi_US"		, C_WINDOWS_1255, C_WINDOWS_1255},
+
+	{"af_ZA"		, C_ISO_8859_1  , C_ISO_8859_1},
+	{"br_FR"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"ca_ES"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"da_DK"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"de_AT"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"de_BE"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"de_CH"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"de_DE"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"de_LU"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"en_AU"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"en_BW"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"en_CA"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"en_DK"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"en_GB"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"en_HK"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"en_IE"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"en_NZ"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"en_PH"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"en_SG"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"en_US"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"en_ZA"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"en_ZW"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"es_AR"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"es_BO"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"es_CL"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"es_CO"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"es_CR"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"es_DO"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"es_EC"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"es_ES"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"es_GT"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"es_HN"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"es_MX"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"es_NI"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"es_PA"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"es_PE"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"es_PR"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"es_PY"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"es_SV"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"es_US"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"es_UY"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"es_VE"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"et_EE"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"eu_ES"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"fi_FI"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"fo_FO"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"fr_BE"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"fr_CA"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"fr_CH"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"fr_FR"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"fr_LU"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"ga_IE"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"gl_ES"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"gv_GB"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"id_ID"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"is_IS"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"it_CH"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"it_IT"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"kl_GL"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"kw_GB"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"ms_MY"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"nl_BE"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"nl_NL"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"nb_NO"		, C_ISO_8859_1  , C_ISO_8859_1},
+	{"nn_NO"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"no_NO"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"oc_FR"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"pt_BR"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"pt_PT"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"sq_AL"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"sv_FI"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"sv_SE"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"tl_PH"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"uz_UZ"		, C_ISO_8859_1	, C_ISO_8859_1},
+	{"wa_BE"		, C_ISO_8859_1	, C_ISO_8859_1},
+
+	{"bs_BA"		, C_ISO_8859_2	, C_ISO_8859_2},
+	{"cs_CZ"		, C_ISO_8859_2	, C_ISO_8859_2},
+	{"hr_HR"		, C_ISO_8859_2	, C_ISO_8859_2},
+	{"hu_HU"		, C_ISO_8859_2	, C_ISO_8859_2},
+	{"pl_PL"		, C_ISO_8859_2	, C_ISO_8859_2},
+	{"ro_RO"		, C_ISO_8859_2	, C_ISO_8859_2},
+	{"sk_SK"		, C_ISO_8859_2	, C_ISO_8859_2},
+	{"sl_SI"		, C_ISO_8859_2	, C_ISO_8859_2},
 
 	{"sr_YU at cyrillic"	, C_ISO_8859_5	, C_ISO_8859_5},
 	{"sr_YU"		, C_ISO_8859_2	, C_ISO_8859_2},
@@ -1217,49 +1217,49 @@ static const struct {
 	{"lt_LT.ISO_8859-4"	, C_ISO_8859_4	, C_ISO_8859_4},
 	{"lt_LT"		, C_ISO_8859_13	, C_ISO_8859_13},
 
-	{"mk_MK"	, C_ISO_8859_5	, C_ISO_8859_5},
-
-	{"ar_AE"	, C_ISO_8859_6	, C_ISO_8859_6},
-	{"ar_BH"	, C_ISO_8859_6	, C_ISO_8859_6},
-	{"ar_DZ"	, C_ISO_8859_6	, C_ISO_8859_6},
-	{"ar_EG"	, C_ISO_8859_6	, C_ISO_8859_6},
-	{"ar_IQ"	, C_ISO_8859_6	, C_ISO_8859_6},
-	{"ar_JO"	, C_ISO_8859_6	, C_ISO_8859_6},
-	{"ar_KW"	, C_ISO_8859_6	, C_ISO_8859_6},
-	{"ar_LB"	, C_ISO_8859_6	, C_ISO_8859_6},
-	{"ar_LY"	, C_ISO_8859_6	, C_ISO_8859_6},
-	{"ar_MA"	, C_ISO_8859_6	, C_ISO_8859_6},
-	{"ar_OM"	, C_ISO_8859_6	, C_ISO_8859_6},
-	{"ar_QA"	, C_ISO_8859_6	, C_ISO_8859_6},
-	{"ar_SA"	, C_ISO_8859_6	, C_ISO_8859_6},
-	{"ar_SD"	, C_ISO_8859_6	, C_ISO_8859_6},
-	{"ar_SY"	, C_ISO_8859_6	, C_ISO_8859_6},
-	{"ar_TN"	, C_ISO_8859_6	, C_ISO_8859_6},
-	{"ar_YE"	, C_ISO_8859_6	, C_ISO_8859_6},
-
-	{"el_GR"	, C_ISO_8859_7	, C_ISO_8859_7},
-	{"he_IL"	, C_ISO_8859_8	, C_ISO_8859_8},
-	{"iw_IL"	, C_ISO_8859_8	, C_ISO_8859_8},
-	{"tr_TR"	, C_ISO_8859_9	, C_ISO_8859_9},
-
-	{"lv_LV"	, C_ISO_8859_13	, C_ISO_8859_13},
-	{"mi_NZ"	, C_ISO_8859_13	, C_ISO_8859_13},
-
-	{"cy_GB"	, C_ISO_8859_14	, C_ISO_8859_14},
-
-	{"ar_IN"	, C_UTF_8	, C_UTF_8},
-	{"en_IN"	, C_UTF_8	, C_UTF_8},
-	{"se_NO"	, C_UTF_8	, C_UTF_8},
-	{"ta_IN"	, C_UTF_8	, C_UTF_8},
-	{"te_IN"	, C_UTF_8	, C_UTF_8},
-	{"ur_PK"	, C_UTF_8	, C_UTF_8},
-
-	{"th_TH"	, C_TIS_620	, C_TIS_620},
-	/* {"th_TH"	, C_WINDOWS_874}, */
-	/* {"th_TH"	, C_ISO_8859_11}, */
-
-	{"ka_GE"	, C_GEORGIAN_PS	, C_GEORGIAN_PS},
-	{"vi_VN.TCVN"	, C_TCVN5712_1	, C_TCVN5712_1},
+	{"mk_MK"		, C_ISO_8859_5	, C_ISO_8859_5},
+
+	{"ar_AE"		, C_ISO_8859_6	, C_ISO_8859_6},
+	{"ar_BH"		, C_ISO_8859_6	, C_ISO_8859_6},
+	{"ar_DZ"		, C_ISO_8859_6	, C_ISO_8859_6},
+	{"ar_EG"		, C_ISO_8859_6	, C_ISO_8859_6},
+	{"ar_IQ"		, C_ISO_8859_6	, C_ISO_8859_6},
+	{"ar_JO"		, C_ISO_8859_6	, C_ISO_8859_6},
+	{"ar_KW"		, C_ISO_8859_6	, C_ISO_8859_6},
+	{"ar_LB"		, C_ISO_8859_6	, C_ISO_8859_6},
+	{"ar_LY"		, C_ISO_8859_6	, C_ISO_8859_6},
+	{"ar_MA"		, C_ISO_8859_6	, C_ISO_8859_6},
+	{"ar_OM"		, C_ISO_8859_6	, C_ISO_8859_6},
+	{"ar_QA"		, C_ISO_8859_6	, C_ISO_8859_6},
+	{"ar_SA"		, C_ISO_8859_6	, C_ISO_8859_6},
+	{"ar_SD"		, C_ISO_8859_6	, C_ISO_8859_6},
+	{"ar_SY"		, C_ISO_8859_6	, C_ISO_8859_6},
+	{"ar_TN"		, C_ISO_8859_6	, C_ISO_8859_6},
+	{"ar_YE"		, C_ISO_8859_6	, C_ISO_8859_6},
+
+	{"el_GR"		, C_ISO_8859_7	, C_ISO_8859_7},
+	{"he_IL"		, C_ISO_8859_8	, C_ISO_8859_8},
+	{"iw_IL"		, C_ISO_8859_8	, C_ISO_8859_8},
+	{"tr_TR"		, C_ISO_8859_9	, C_ISO_8859_9},
+
+	{"lv_LV"		, C_ISO_8859_13	, C_ISO_8859_13},
+	{"mi_NZ"		, C_ISO_8859_13	, C_ISO_8859_13},
+
+	{"cy_GB"		, C_ISO_8859_14	, C_ISO_8859_14},
+
+	{"ar_IN"		, C_UTF_8	, C_UTF_8},
+	{"en_IN"		, C_UTF_8	, C_UTF_8},
+	{"se_NO"		, C_UTF_8	, C_UTF_8},
+	{"ta_IN"		, C_UTF_8	, C_UTF_8},
+	{"te_IN"		, C_UTF_8	, C_UTF_8},
+	{"ur_PK"		, C_UTF_8	, C_UTF_8},
+
+	{"th_TH"		, C_TIS_620	, C_TIS_620},
+	/* {"th_TH"		, C_WINDOWS_874}, */
+	/* {"th_TH"		, C_ISO_8859_11}, */
+
+	{"ka_GE"		, C_GEORGIAN_PS	, C_GEORGIAN_PS},
+	{"vi_VN.TCVN"		, C_TCVN5712_1	, C_TCVN5712_1},
 
 	{"C"			, C_US_ASCII	, C_US_ASCII},
 	{"POSIX"		, C_US_ASCII	, C_US_ASCII},
@@ -1326,12 +1326,12 @@ CharSet conv_get_charset_from_str(const gchar *charset)
 
 static CharSet conv_get_locale_charset(void)
 {
-	static CharSet cur_charset = -1;
+	static CharSet cur_charset = C_UNINITIALIZED;
 	const gchar *cur_locale;
 	const gchar *p;
 	gint i;
 
-	if (cur_charset != -1)
+	if (cur_charset != C_UNINITIALIZED)
 		return cur_charset;
 
 	cur_locale = conv_get_current_locale();
@@ -1376,7 +1376,7 @@ static CharSet conv_get_locale_charset(void)
 
 static CharSet conv_get_locale_charset_no_utf8(void)
 {
-	static CharSet cur_charset = -1;
+	static CharSet cur_charset = C_UNINITIALIZED;
 	const gchar *cur_locale;
 	const gchar *p;
 	gint i;
@@ -1448,12 +1448,12 @@ const gchar *conv_get_locale_charset_str_no_utf8(void)
 
 static CharSet conv_get_outgoing_charset(void)
 {
-	static CharSet out_charset = -1;
+	static CharSet out_charset = C_UNINITIALIZED;
 	const gchar *cur_locale;
 	const gchar *p;
 	gint i;
 
-	if (out_charset != -1)
+	if (out_charset != C_UNINITIALIZED)
 		return out_charset;
 
 	cur_locale = conv_get_current_locale();
diff --git a/src/codeconv.h b/src/codeconv.h
index 9cf2596..4109a13 100644
--- a/src/codeconv.h
+++ b/src/codeconv.h
@@ -31,6 +31,7 @@ typedef struct _CodeConverter	CodeConverter;
 
 typedef enum
 {
+	C_UNINITIALIZED,
 	C_AUTO,
 	C_US_ASCII,
 	C_UTF_8,

-----------------------------------------------------------------------


hooks/post-receive
-- 
Claws Mail


More information about the Commits mailing list