sync with 0.9.9cvs13

diff --git a/ChangeLog b/ChangeLog
index d0fbec8f4d8b1b86c06bc21925a203202d696f9b..f5dbb3fa1da8292b111c65544343301e6173293d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2004-02-24
+
+       * src/codeconv.[ch]: added ISO-2022-JP-3 encoding.
+
+2004-02-24
+
+       * src/codeconv.c
+         src/mainwindow.c
+         src/messageview.c: added KOI8-U encoding.
+       * src/prefs_common.c: prefs_message_create(): modified the string
+         of resizing image option.
+

 2004-02-19
 
        * src/addressbook.c: addressbook_list_selected(): corrected its
 2004-02-19
 
        * src/addressbook.c: addressbook_list_selected(): corrected its

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 4376106556857a56b84323000708a6f0f396764c..3138b1b9b6493882e8eea4c34737d312d244d2f5 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2004-02-24 [paul]      0.9.9claws28
+
+       * sync with 0.9.9cvs13
+               see ChangeLog 2004-02-24
+

 2004-02-23 [paul]      0.9.9claws27
 
        * src/inc.c
 2004-02-23 [paul]      0.9.9claws27
 
        * src/inc.c

diff --git a/ChangeLog.jp b/ChangeLog.jp
index cf96e67aef169bd9e0bb5d250f39eee1c58cc447..ded82a3692b9a99384d7730e7c8df8ec7b3bbf87 100644 (file)
--- a/ChangeLog.jp
+++ b/ChangeLog.jp
@@ -1,3 +1,15 @@
+2004-02-24
+
+       * src/codeconv.[ch]: ISO-2022-JP-3 ¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤òÄɲá£
+
+2004-02-24
+
+       * src/codeconv.c
+         src/mainwindow.c
+         src/messageview.c: KOI8-U ¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤òÄɲá£
+       * src/prefs_common.c: prefs_message_create(): ²èÁü¥ê¥µ¥¤¥º¥ª¥×¥·¥ç¥ó
+         ¤Îʸ»úÎó¤ò½¤Àµ¡£
+

 2004-02-19
 
        * src/addressbook.c: addressbook_list_selected(): °ú¿ô¤ò½¤Àµ¡£
 2004-02-19
 
        * src/addressbook.c: addressbook_list_selected(): °ú¿ô¤ò½¤Àµ¡£

diff --git a/configure.ac b/configure.ac
index d66ef704e08c68b97ebc6f42955dc453135bfce2..dea1fd0678bae4d87314f00945eb34c2b9a6d3da 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=9
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=9
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=27
+EXTRA_VERSION=28

 if test $EXTRA_VERSION -eq 0; then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}claws
 else
 if test $EXTRA_VERSION -eq 0; then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}claws
 else

diff --git a/src/codeconv.c b/src/codeconv.c
index 2394cbe4e29fc830b3548642eacfe26912c9ee82..75a2e3e676e12143af5f5e34e784957f7d3e7212 100644 (file)
--- a/src/codeconv.c
+++ b/src/codeconv.c
@@ -833,6 +833,7 @@ CodeConvFunc conv_get_code_conv_func(const gchar *src_charset_str,
        switch (src_charset) {
        case C_ISO_2022_JP:
        case C_ISO_2022_JP_2:
        switch (src_charset) {
        case C_ISO_2022_JP:
        case C_ISO_2022_JP_2:

+       case C_ISO_2022_JP_3:

                if (dest_charset == C_AUTO &&
                    conv_get_current_charset() == C_EUC_JP)
                        code_conv = conv_jistodisp;
                if (dest_charset == C_AUTO &&
                    conv_get_current_charset() == C_EUC_JP)
                        code_conv = conv_jistodisp;


@@ -873,8 +874,9 @@ CodeConvFunc conv_get_code_conv_func(const gchar *src_charset_str,
                if (dest_charset == C_AUTO &&
                    conv_get_current_charset() == C_EUC_JP)
                        code_conv = conv_euctodisp;
                if (dest_charset == C_AUTO &&
                    conv_get_current_charset() == C_EUC_JP)
                        code_conv = conv_euctodisp;

-               else if (dest_charset == C_ISO_2022_JP ||
-                        dest_charset == C_ISO_2022_JP_2)
+               else if (dest_charset == C_ISO_2022_JP   ||
+                        dest_charset == C_ISO_2022_JP_2 ||
+                        dest_charset == C_ISO_2022_JP_3)

                        code_conv = conv_euctojis;
                break;
        default:
                        code_conv = conv_euctojis;
                break;
        default:


@@ -1023,6 +1025,7 @@ static const struct {
        {C_KOI8_U,              CS_KOI8_U},
        {C_ISO_2022_JP,         CS_ISO_2022_JP},
        {C_ISO_2022_JP_2,       CS_ISO_2022_JP_2},
        {C_KOI8_U,              CS_KOI8_U},
        {C_ISO_2022_JP,         CS_ISO_2022_JP},
        {C_ISO_2022_JP_2,       CS_ISO_2022_JP_2},

+       {C_ISO_2022_JP_3,       CS_ISO_2022_JP_3},

        {C_EUC_JP,              CS_EUC_JP},
        {C_EUC_JP,              CS_EUCJP},
        {C_SHIFT_JIS,           CS_SHIFT_JIS},
        {C_EUC_JP,              CS_EUC_JP},
        {C_EUC_JP,              CS_EUCJP},
        {C_SHIFT_JIS,           CS_SHIFT_JIS},


@@ -1072,6 +1075,7 @@ static const struct {
        {"ru_RU"        , C_ISO_8859_5  , C_KOI8_R},
        {"tg_TJ"        , C_KOI8_T      , C_KOI8_T},
        {"ru_UA"        , C_KOI8_U      , C_KOI8_U},
        {"ru_RU"        , C_ISO_8859_5  , C_KOI8_R},
        {"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},
        {"uk_UA"        , C_KOI8_U      , C_KOI8_U},
 
        {"be_BY"        , C_WINDOWS_1251, C_WINDOWS_1251},


@@ -1417,6 +1421,7 @@ gboolean conv_is_multibyte_encoding(CharSet encoding)
        case C_EUC_CN:
        case C_ISO_2022_JP:
        case C_ISO_2022_JP_2:
        case C_EUC_CN:
        case C_ISO_2022_JP:
        case C_ISO_2022_JP_2:

+       case C_ISO_2022_JP_3:

        case C_ISO_2022_KR:
        case C_ISO_2022_CN:
        case C_SHIFT_JIS:
        case C_ISO_2022_KR:
        case C_ISO_2022_CN:
        case C_SHIFT_JIS:

diff --git a/src/codeconv.h b/src/codeconv.h
index 19c24248f337d0b56a3cccd65281efe862854979..e08a2a8114b67723fc46599997c3faa87f891634 100644 (file)
--- a/src/codeconv.h
+++ b/src/codeconv.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client

- * Copyright (C) 1999-2003 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2004 Hiroyuki Yamamoto

  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by


@@ -72,6 +72,7 @@ typedef enum
        C_KOI8_U,
        C_ISO_2022_JP,
        C_ISO_2022_JP_2,
        C_KOI8_U,
        C_ISO_2022_JP,
        C_ISO_2022_JP_2,

+       C_ISO_2022_JP_3,

        C_EUC_JP,
        C_SHIFT_JIS,
        C_ISO_2022_KR,
        C_EUC_JP,
        C_SHIFT_JIS,
        C_ISO_2022_KR,


@@ -141,6 +142,7 @@ struct _CodeConverter
 #define CS_KOI8_U              "KOI8-U"
 #define CS_ISO_2022_JP         "ISO-2022-JP"
 #define CS_ISO_2022_JP_2       "ISO-2022-JP-2"
 #define CS_KOI8_U              "KOI8-U"
 #define CS_ISO_2022_JP         "ISO-2022-JP"
 #define CS_ISO_2022_JP_2       "ISO-2022-JP-2"

+#define CS_ISO_2022_JP_3       "ISO-2022-JP-3"

 #define CS_EUC_JP              "EUC-JP"
 #define CS_EUCJP               "EUCJP"
 #define CS_SHIFT_JIS           "Shift_JIS"
 #define CS_EUC_JP              "EUC-JP"
 #define CS_EUCJP               "EUCJP"
 #define CS_SHIFT_JIS           "Shift_JIS"

diff --git a/src/mainwindow.c b/src/mainwindow.c
index c33da36954382859b04b294e1c4dd091aefde54f..be4154026b9586304ab39c0001310884732472d2 100644 (file)
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -580,6 +580,8 @@ static GtkItemFactoryEntry mainwin_entries[] =
         CODESET_ACTION(C_ISO_8859_5)},
        {N_("/_View/_Code set/Cyrillic (KOI8-_R)"),
         CODESET_ACTION(C_KOI8_R)},
         CODESET_ACTION(C_ISO_8859_5)},
        {N_("/_View/_Code set/Cyrillic (KOI8-_R)"),
         CODESET_ACTION(C_KOI8_R)},

+       {N_("/_View/_Code set/Cyrillic (KOI8-U)"),
+        CODESET_ACTION(C_KOI8_U)},

        {N_("/_View/_Code set/Cyrillic (Windows-1251)"),
         CODESET_ACTION(C_WINDOWS_1251)},
        CODESET_SEPARATOR,
        {N_("/_View/_Code set/Cyrillic (Windows-1251)"),
         CODESET_ACTION(C_WINDOWS_1251)},
        CODESET_SEPARATOR,

diff --git a/src/messageview.c b/src/messageview.c
index bb295c37e257a8d3f8a24a8755abd478b62dc1e1..7da9d296192f6bbebdded0e8aa0cf11ac25dde5b 100644 (file)
--- a/src/messageview.c
+++ b/src/messageview.c
@@ -196,6 +196,8 @@ static GtkItemFactoryEntry msgview_entries[] =
         CODESET_ACTION(C_ISO_8859_5)},
        {N_("/_View/_Code set/Cyrillic (KOI8-_R)"),
         CODESET_ACTION(C_KOI8_R)},
         CODESET_ACTION(C_ISO_8859_5)},
        {N_("/_View/_Code set/Cyrillic (KOI8-_R)"),
         CODESET_ACTION(C_KOI8_R)},

+       {N_("/_View/_Code set/Cyrillic (KOI8-U)"),
+        CODESET_ACTION(C_KOI8_U)},

        {N_("/_View/_Code set/Cyrillic (Windows-1251)"),
         CODESET_ACTION(C_CP1251)},
        CODESET_SEPARATOR,
        {N_("/_View/_Code set/Cyrillic (Windows-1251)"),
         CODESET_ACTION(C_CP1251)},
        CODESET_SEPARATOR,