From 88c4388489a82fc8713b4ffe043a5f13bb01b7db Mon Sep 17 00:00:00 2001 From: Paul Mangan Date: Mon, 24 Sep 2007 10:38:03 +0000 Subject: [PATCH 1/1] 2007-09-24 [paul] 3.0.1cvs26 * src/compose.c compact the character set menu, adding some missing encodings. Patch by Pawel Pekala --- ChangeLog | 6 +++++ PATCHSETS | 1 + configure.ac | 2 +- src/compose.c | 72 ++++++++++++++++++++++++++++----------------------- 4 files changed, 47 insertions(+), 34 deletions(-) diff --git a/ChangeLog b/ChangeLog index 75aecb674..0b43e8808 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-09-24 [paul] 3.0.1cvs26 + + * src/compose.c + compact the character set menu, adding some + missing encodings. Patch by Pawel Pekala + 2007-09-23 [paul] 3.0.1cvs25 * src/prefs_account.c diff --git a/PATCHSETS b/PATCHSETS index e6f9b9c9c..a49833a2e 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -2889,3 +2889,4 @@ ( cvs diff -u -r 1.179.2.187 -r 1.179.2.188 src/imap.c; cvs diff -u -r 1.60.2.47 -r 1.60.2.48 src/procmsg.h; cvs diff -u -r 1.36.2.113 -r 1.36.2.114 src/common/utils.c; cvs diff -u -r 1.20.2.50 -r 1.20.2.51 src/common/utils.h; cvs diff -u -r 1.1.4.84 -r 1.1.4.85 src/etpan/imap-thread.c; ) > 3.0.1cvs23.patchset ( cvs diff -u -r 1.1.2.76 -r 1.1.2.77 src/gtk/quicksearch.c; ) > 3.0.1cvs24.patchset ( cvs diff -u -r 1.105.2.111 -r 1.105.2.112 src/prefs_account.c; cvs diff -u -r 1.52.2.50 -r 1.52.2.51 src/prefs_folder_item.c; cvs diff -u -r 1.1.2.24 -r 1.1.2.25 src/prefs_quote.c; cvs diff -u -r 1.8.2.24 -r 1.8.2.25 src/quote_fmt.c; cvs diff -u -r 1.5.12.11 -r 1.5.12.12 src/quote_fmt.h; ) > 3.0.1cvs25.patchset +( cvs diff -u -r 1.382.2.410 -r 1.382.2.411 src/compose.c; ) > 3.0.1cvs26.patchset diff --git a/configure.ac b/configure.ac index fdf855c4f..069cd1c40 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=0 MICRO_VERSION=1 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=25 +EXTRA_VERSION=26 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/compose.c b/src/compose.c index cfc33e50f..9c777933a 100644 --- a/src/compose.c +++ b/src/compose.c @@ -728,75 +728,81 @@ static GtkItemFactoryEntry compose_entries[] = ENC_ACTION(C_UTF_8)}, {N_("/_Options/Character _encoding/---"), NULL, NULL, 0, ""}, - {N_("/_Options/Character _encoding/Western European (ISO-8859-_1)"), + {N_("/_Options/Character _encoding/Western European"), NULL, NULL, 0, ""}, + {N_("/_Options/Character _encoding/Western European/ISO-8859-_1"), ENC_ACTION(C_ISO_8859_1)}, - {N_("/_Options/Character _encoding/Western European (ISO-8859-15)"), + {N_("/_Options/Character _encoding/Western European/ISO-8859-15"), ENC_ACTION(C_ISO_8859_15)}, - {N_("/_Options/Character _encoding/Western European (Windows-1252)"), + {N_("/_Options/Character _encoding/Western European/Windows-1252"), ENC_ACTION(C_WINDOWS_1252)}, - {N_("/_Options/Character _encoding/---"), NULL, NULL, 0, ""}, {N_("/_Options/Character _encoding/Central European (ISO-8859-_2)"), ENC_ACTION(C_ISO_8859_2)}, - {N_("/_Options/Character _encoding/---"), NULL, NULL, 0, ""}, - {N_("/_Options/Character _encoding/_Baltic (ISO-8859-13)"), + {N_("/_Options/Character _encoding/Baltic"), NULL, NULL, 0, ""}, + {N_("/_Options/Character _encoding/Baltic/ISO-8859-13"), ENC_ACTION(C_ISO_8859_13)}, - {N_("/_Options/Character _encoding/Baltic (ISO-8859-_4)"), + {N_("/_Options/Character _encoding/Baltic/ISO-8859-_4"), ENC_ACTION(C_ISO_8859_4)}, - {N_("/_Options/Character _encoding/---"), NULL, NULL, 0, ""}, {N_("/_Options/Character _encoding/Greek (ISO-8859-_7)"), ENC_ACTION(C_ISO_8859_7)}, - {N_("/_Options/Character _encoding/---"), NULL, NULL, 0, ""}, - {N_("/_Options/Character _encoding/Hebrew (ISO-8859-_8)"), + {N_("/_Options/Character _encoding/Hebrew"), NULL, NULL, 0, ""}, + {N_("/_Options/Character _encoding/Hebrew/ISO-8859-_8"), ENC_ACTION(C_ISO_8859_8)}, - {N_("/_Options/Character _encoding/Hebrew (Windows-1255)"), + {N_("/_Options/Character _encoding/Hebrew/Windows-1255"), ENC_ACTION(C_WINDOWS_1255)}, - {N_("/_Options/Character _encoding/---"), NULL, NULL, 0, ""}, - {N_("/_Options/Character _encoding/Arabic (ISO-8859-_6)"), + {N_("/_Options/Character _encoding/Arabic"), NULL, NULL, 0, ""}, + {N_("/_Options/Character _encoding/Arabic/ISO-8859-_6"), ENC_ACTION(C_ISO_8859_6)}, - {N_("/_Options/Character _encoding/Arabic (Windows-1256)"), + {N_("/_Options/Character _encoding/Arabic/Windows-1256"), ENC_ACTION(C_CP1256)}, - {N_("/_Options/Character _encoding/---"), NULL, NULL, 0, ""}, {N_("/_Options/Character _encoding/Turkish (ISO-8859-_9)"), ENC_ACTION(C_ISO_8859_9)}, - {N_("/_Options/Character _encoding/---"), NULL, NULL, 0, ""}, - {N_("/_Options/Character _encoding/Cyrillic (ISO-8859-_5)"), + {N_("/_Options/Character _encoding/Cyrillic"), NULL, NULL, 0, ""}, + {N_("/_Options/Character _encoding/Cyrillic/ISO-8859-_5"), ENC_ACTION(C_ISO_8859_5)}, - {N_("/_Options/Character _encoding/Cyrillic (KOI8-_R)"), + {N_("/_Options/Character _encoding/Cyrillic/KOI8-_R"), ENC_ACTION(C_KOI8_R)}, - {N_("/_Options/Character _encoding/Cyrillic (KOI8-U)"), + {N_("/_Options/Character _encoding/Cyrillic/KOI8-U"), ENC_ACTION(C_KOI8_U)}, - {N_("/_Options/Character _encoding/Cyrillic (Windows-1251)"), + {N_("/_Options/Character _encoding/Cyrillic/Windows-1251"), ENC_ACTION(C_WINDOWS_1251)}, - {N_("/_Options/Character _encoding/---"), NULL, NULL, 0, ""}, - {N_("/_Options/Character _encoding/Japanese (ISO-2022-_JP)"), + {N_("/_Options/Character _encoding/Japanese"), NULL, NULL, 0, ""}, + {N_("/_Options/Character _encoding/Japanese/ISO-2022-_JP"), ENC_ACTION(C_ISO_2022_JP)}, - {N_("/_Options/Character _encoding/---"), NULL, NULL, 0, ""}, - - {N_("/_Options/Character _encoding/Simplified Chinese (_GB2312)"), + {N_("/_Options/Character _encoding/Japanese/ISO-2022-JP-2"), + ENC_ACTION(C_ISO_2022_JP_2)}, + {N_("/_Options/Character _encoding/Japanese/_EUC-JP"), + ENC_ACTION(C_EUC_JP)}, + {N_("/_Options/Character _encoding/Japanese/_Shift__JIS"), + ENC_ACTION(C_SHIFT_JIS)}, + + {N_("/_Options/Character _encoding/Chinese"), NULL, NULL, 0, ""}, + {N_("/_Options/Character _encoding/Chinese/Simplified (_GB2312)"), ENC_ACTION(C_GB2312)}, - {N_("/_Options/Character _encoding/Simplified Chinese (GBK)"), + {N_("/_Options/Character _encoding/Chinese/Simplified (GBK)"), ENC_ACTION(C_GBK)}, - {N_("/_Options/Character _encoding/Traditional Chinese (_Big5)"), + {N_("/_Options/Character _encoding/Chinese/Traditional (_Big5)"), ENC_ACTION(C_BIG5)}, - {N_("/_Options/Character _encoding/Traditional Chinese (EUC-_TW)"), + {N_("/_Options/Character _encoding/Chinese/Traditional (EUC-_TW)"), ENC_ACTION(C_EUC_TW)}, - {N_("/_Options/Character _encoding/---"), NULL, NULL, 0, ""}, - {N_("/_Options/Character _encoding/Korean (EUC-_KR)"), + {N_("/_Options/Character _encoding/Korean"), NULL, NULL, 0, ""}, + {N_("/_Options/Character _encoding/Korean/EUC-_KR"), ENC_ACTION(C_EUC_KR)}, - {N_("/_Options/Character _encoding/---"), NULL, NULL, 0, ""}, + {N_("/_Options/Character _encoding/Korean/ISO-2022-KR"), + ENC_ACTION(C_ISO_2022_KR)}, - {N_("/_Options/Character _encoding/Thai (TIS-620)"), + {N_("/_Options/Character _encoding/Thai"), NULL, NULL, 0, ""}, + {N_("/_Options/Character _encoding/Thai/TIS-620"), ENC_ACTION(C_TIS_620)}, - {N_("/_Options/Character _encoding/Thai (Windows-874)"), + {N_("/_Options/Character _encoding/Thai/Windows-874"), ENC_ACTION(C_WINDOWS_874)}, {N_("/_Tools"), NULL, NULL, 0, ""}, -- 2.25.1