talons

commit b6a112c69c8ed66a0159f53a102c6644ec95ac7e
parent de2040b63f9fd2adb37a4dd573ae03efe53af1b4
Author: Paul <paul@claws-mail.org>
Date:   Mon, 26 Jan 2015 05:03:29 +0000

Mac-Cyrillic menu updates. patch by Anton Butanaev

Diffstat:
M
src/codeconv.h
 | 
2
+-
M
src/compose.c
 | 
2
+-
M
src/mainwindow.c
 | 
2
+-
M
src/procmime.c
 | 
2
+-

4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/codeconv.h b/src/codeconv.h
@@ -143,7 +143,7 @@ struct _CodeConverter
 #define CS_WINDOWS_1258		"Windows-1258"
 #define CS_KOI8_R		"KOI8-R"
 #define CS_X_MACCYR		"x-mac-cyrillic"
-#define CS_MACCYR		"mac-cyrillic"
+#define CS_MACCYR		"Mac-Cyrillic"
 #define CS_KOI8_T		"KOI8-T"
 #define CS_KOI8_U		"KOI8-U"
 #define CS_ISO_2022_JP		"ISO-2022-JP"
diff --git a/src/compose.c b/src/compose.c
@@ -737,7 +737,7 @@ static GtkRadioActionEntry compose_radio_enc_entries[] =
 	ENC_ACTION(CS_ISO_8859_9, C_ISO_8859_9, N_("Turkish (ISO-8859-_9)")), /* RADIO compose_set_encoding_cb */
 	ENC_ACTION("Cyrillic/"CS_ISO_8859_5, C_ISO_8859_5, "ISO-8859-_5"), /* RADIO compose_set_encoding_cb */
 	ENC_ACTION("Cyrillic/"CS_KOI8_R, C_KOI8_R, "KOI8-_R"), /* RADIO compose_set_encoding_cb */
-	ENC_ACTION("Cyrillic/"CS_MACCYR, C_MACCYR, "MAC_CYR"), /* RADIO compose_set_encoding_cb */
+	ENC_ACTION("Cyrillic/"CS_MACCYR, C_MACCYR, "_Mac-Cyrillic"), /* RADIO compose_set_encoding_cb */
 	ENC_ACTION("Cyrillic/"CS_KOI8_U, C_KOI8_U, "KOI8-_U"), /* RADIO compose_set_encoding_cb */
 	ENC_ACTION("Cyrillic/"CS_WINDOWS_1251, C_WINDOWS_1251, "Windows-1251"), /* RADIO compose_set_encoding_cb */
 	ENC_ACTION("Japanese/"CS_ISO_2022_JP, C_ISO_2022_JP, "ISO-2022-_JP"), /* RADIO compose_set_encoding_cb */
diff --git a/src/mainwindow.c b/src/mainwindow.c
@@ -882,7 +882,7 @@ static GtkRadioActionEntry mainwin_radio_enc_entries[] =
 	ENC_ACTION(CS_ISO_8859_9, C_ISO_8859_9, N_("Turkish (ISO-8859-_9)")), /* RADIO set_charset_cb */
 	ENC_ACTION("Cyrillic/"CS_ISO_8859_5, C_ISO_8859_5, "ISO-8859-_5"), /* RADIO set_charset_cb */
 	ENC_ACTION("Cyrillic/"CS_KOI8_R, C_KOI8_R, "KOI8-_R"), /* RADIO set_charset_cb */
-	ENC_ACTION("Cyrillic/"CS_MACCYR, C_MACCYR, "MAC_CYR"), /* RADIO set_charset_cb */
+	ENC_ACTION("Cyrillic/"CS_MACCYR, C_MACCYR, "_Mac-Cyrillic"), /* RADIO set_charset_cb */
 	ENC_ACTION("Cyrillic/"CS_KOI8_U, C_KOI8_U, "KOI8-_U"), /* RADIO set_charset_cb */
 	ENC_ACTION("Cyrillic/"CS_WINDOWS_1251, C_WINDOWS_1251, "Windows-1251"), /* RADIO set_charset_cb */
 	ENC_ACTION("Japanese/"CS_ISO_2022_JP, C_ISO_2022_JP, "ISO-2022-_JP"), /* RADIO set_charset_cb */
diff --git a/src/procmime.c b/src/procmime.c
@@ -1270,7 +1270,7 @@ EncodingType procmime_get_encoding_for_charset(const gchar *charset)
 	else if (!g_ascii_strcasecmp(charset, "ISO-8859-5") ||
 		 !g_ascii_strncasecmp(charset, "KOI8-", 5) ||
 		 !g_ascii_strcasecmp(charset, "X-MAC-CYRILLIC") ||
-		 !g_ascii_strcasecmp(charset, "MACCYRILLIC") ||
+		 !g_ascii_strcasecmp(charset, "MAC-CYRILLIC") ||
 		 !g_ascii_strcasecmp(charset, "Windows-1251"))
 		return ENC_8BIT;
 	else if (!g_ascii_strncasecmp(charset, "ISO-8859-", 9))