projects / claws.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 17aa9e3)
2007-09-24 [paul] 3.0.1cvs26
authorPaul Mangan <paul@claws-mail.org>
Mon, 24 Sep 2007 10:38:03 +0000 (10:38 +0000)
committerPaul Mangan <paul@claws-mail.org>
Mon, 24 Sep 2007 10:38:03 +0000 (10:38 +0000)
* src/compose.c
compact the character set menu, adding some
missing encodings. Patch by Pawel Pekala

ChangeLog patch | blob | history
PATCHSETS patch | blob | history
configure.ac patch | blob | history
src/compose.c patch | blob | history

diff --git a/ChangeLog b/ChangeLog
index 75aecb67410490ccb478cebcfdbe6d3de5b1091b..0b43e8808b856b21fd10774eb9266dcbc6c7a9fc 100644 (file)
--- 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
 2007-09-23 [paul]      3.0.1cvs25
 
        * src/prefs_account.c
diff --git a/PATCHSETS b/PATCHSETS
index e6f9b9c9c56a2f28f61c8410fa9aa67af2b4f67a..a49833a2ef2e3f2a6bf2f7246f9598123764b8ca 100644 (file)
--- 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.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 fdf855c4f74ac21a07fed75bf084f55fa1d98fcc..069cd1c4069ad0270604068f2e08f12f003b33ff 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=0
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=25
+EXTRA_VERSION=26
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/compose.c b/src/compose.c
index cfc33e50febb59e112565dca851e03a0e66f81cd..9c777933a5ea5a894a32010af90e21eca42e23ef 100644 (file)
--- 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, "<Separator>"},
 
         ENC_ACTION(C_UTF_8)},
        {N_("/_Options/Character _encoding/---"), NULL, NULL, 0, "<Separator>"},
 
-       {N_("/_Options/Character _encoding/Western European (ISO-8859-_1)"),
+       {N_("/_Options/Character _encoding/Western European"), NULL, NULL, 0, "<Branch>"},
+       {N_("/_Options/Character _encoding/Western European/ISO-8859-_1"),
         ENC_ACTION(C_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)},
         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)},
         ENC_ACTION(C_WINDOWS_1252)},
-       {N_("/_Options/Character _encoding/---"), NULL, NULL, 0, "<Separator>"},
 
        {N_("/_Options/Character _encoding/Central European (ISO-8859-_2)"),
         ENC_ACTION(C_ISO_8859_2)},
 
        {N_("/_Options/Character _encoding/Central European (ISO-8859-_2)"),
         ENC_ACTION(C_ISO_8859_2)},
-       {N_("/_Options/Character _encoding/---"), NULL, NULL, 0, "<Separator>"},
 
 
-       {N_("/_Options/Character _encoding/_Baltic (ISO-8859-13)"),
+       {N_("/_Options/Character _encoding/Baltic"), NULL, NULL, 0, "<Branch>"},
+       {N_("/_Options/Character _encoding/Baltic/ISO-8859-13"),
         ENC_ACTION(C_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)},
         ENC_ACTION(C_ISO_8859_4)},
-       {N_("/_Options/Character _encoding/---"), NULL, NULL, 0, "<Separator>"},
 
        {N_("/_Options/Character _encoding/Greek (ISO-8859-_7)"),
         ENC_ACTION(C_ISO_8859_7)},
 
        {N_("/_Options/Character _encoding/Greek (ISO-8859-_7)"),
         ENC_ACTION(C_ISO_8859_7)},
-       {N_("/_Options/Character _encoding/---"), NULL, NULL, 0, "<Separator>"},
 
 
-       {N_("/_Options/Character _encoding/Hebrew (ISO-8859-_8)"),
+       {N_("/_Options/Character _encoding/Hebrew"), NULL, NULL, 0, "<Branch>"},
+       {N_("/_Options/Character _encoding/Hebrew/ISO-8859-_8"),
         ENC_ACTION(C_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)},
         ENC_ACTION(C_WINDOWS_1255)},
-       {N_("/_Options/Character _encoding/---"), NULL, NULL, 0, "<Separator>"},
 
 
-       {N_("/_Options/Character _encoding/Arabic (ISO-8859-_6)"),
+       {N_("/_Options/Character _encoding/Arabic"), NULL, NULL, 0, "<Branch>"},
+       {N_("/_Options/Character _encoding/Arabic/ISO-8859-_6"),
         ENC_ACTION(C_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)},
         ENC_ACTION(C_CP1256)},
-       {N_("/_Options/Character _encoding/---"), NULL, NULL, 0, "<Separator>"},
 
        {N_("/_Options/Character _encoding/Turkish (ISO-8859-_9)"),
         ENC_ACTION(C_ISO_8859_9)},
 
        {N_("/_Options/Character _encoding/Turkish (ISO-8859-_9)"),
         ENC_ACTION(C_ISO_8859_9)},
-       {N_("/_Options/Character _encoding/---"), NULL, NULL, 0, "<Separator>"},
 
 
-       {N_("/_Options/Character _encoding/Cyrillic (ISO-8859-_5)"),
+       {N_("/_Options/Character _encoding/Cyrillic"), NULL, NULL, 0, "<Branch>"},
+       {N_("/_Options/Character _encoding/Cyrillic/ISO-8859-_5"),
         ENC_ACTION(C_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)},
         ENC_ACTION(C_KOI8_R)},
-       {N_("/_Options/Character _encoding/Cyrillic (KOI8-U)"),
+       {N_("/_Options/Character _encoding/Cyrillic/KOI8-U"),
         ENC_ACTION(C_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)},
         ENC_ACTION(C_WINDOWS_1251)},
-       {N_("/_Options/Character _encoding/---"), NULL, NULL, 0, "<Separator>"},
 
 
-       {N_("/_Options/Character _encoding/Japanese (ISO-2022-_JP)"),
+       {N_("/_Options/Character _encoding/Japanese"), NULL, NULL, 0, "<Branch>"},
+       {N_("/_Options/Character _encoding/Japanese/ISO-2022-_JP"),
         ENC_ACTION(C_ISO_2022_JP)},
         ENC_ACTION(C_ISO_2022_JP)},
-       {N_("/_Options/Character _encoding/---"), NULL, NULL, 0, "<Separator>"},
-
-       {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, "<Branch>"},
+       {N_("/_Options/Character _encoding/Chinese/Simplified (_GB2312)"),
         ENC_ACTION(C_GB2312)},
         ENC_ACTION(C_GB2312)},
-       {N_("/_Options/Character _encoding/Simplified Chinese (GBK)"),
+       {N_("/_Options/Character _encoding/Chinese/Simplified (GBK)"),
         ENC_ACTION(C_GBK)},
         ENC_ACTION(C_GBK)},
-       {N_("/_Options/Character _encoding/Traditional Chinese (_Big5)"),
+       {N_("/_Options/Character _encoding/Chinese/Traditional (_Big5)"),
         ENC_ACTION(C_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)},
         ENC_ACTION(C_EUC_TW)},
-       {N_("/_Options/Character _encoding/---"), NULL, NULL, 0, "<Separator>"},
 
 
-       {N_("/_Options/Character _encoding/Korean (EUC-_KR)"),
+       {N_("/_Options/Character _encoding/Korean"), NULL, NULL, 0, "<Branch>"},
+       {N_("/_Options/Character _encoding/Korean/EUC-_KR"),
         ENC_ACTION(C_EUC_KR)},
         ENC_ACTION(C_EUC_KR)},
-       {N_("/_Options/Character _encoding/---"), NULL, NULL, 0, "<Separator>"},
+       {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, "<Branch>"},
+       {N_("/_Options/Character _encoding/Thai/TIS-620"),
         ENC_ACTION(C_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, "<Branch>"},
         ENC_ACTION(C_WINDOWS_874)},
 
        {N_("/_Tools"),                 NULL, NULL, 0, "<Branch>"},
Claws Mail