Mac-Cyrillic menu updates. patch by Anton Butanaev
authorPaul <paul@claws-mail.org>
Mon, 26 Jan 2015 05:03:29 +0000 (05:03 +0000)
committerPaul <paul@claws-mail.org>
Mon, 26 Jan 2015 05:03:29 +0000 (05:03 +0000)
src/codeconv.h
src/compose.c
src/mainwindow.c
src/procmime.c

index bdc6dff..f025864 100644 (file)
@@ -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"
index d4156ca..ab951c4 100644 (file)
@@ -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 */
index 377d1b9..641d379 100644 (file)
@@ -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 */
index 78ef192..e15738d 100644 (file)
@@ -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))