sync with sylpheed 0.6.3cvs2

diff --git a/ChangeLog b/ChangeLog
index f1641680c12d6be0b4dc99341e13bfbfd4733c0a..e1e24acdf621fb6c1ff06c47ec9a61eb380aac6a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,16 @@
+2001-10-10
+
+       * src/utils.c: to_human_readable(): made a bit of optimization.
+       * src/summaryview.c: summary_delete(): fixed a focus problem.
+

 2001-10-09
 
        * updated some autotool scripts.
 2001-10-09
 
        * updated some autotool scripts.

+       * src/codeconv.c: conv_encode_header(): fixed a bug that caused
+         infinite loop when failed to convert encoding.
+       * src/codeconv.[ch]: a fix for older version of libjconv
+         (jconv_info_get_current_codeset() returned "EUCJP" instead of
+         "EUC-JP".

 
 2001-10-08
 
 
 2001-10-08
 

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 8d7cde931620304025b3a4f2d13e719214ec7c96..01c16bc550173ae7334fbe74fcde72cfa1e52b4f 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2001-10-10 [paul]      0.6.3claws6
+
+       * sync with sylpheed 0.6.3cvs2
+               see ChangeLog entries 2001-10-09 and 2001-10-10
+

 2001-10-10 [darko]     0.6.3.claws5
 
        * src/gtkstext.c
 2001-10-10 [darko]     0.6.3.claws5
 
        * src/gtkstext.c

diff --git a/ChangeLog.jp b/ChangeLog.jp
index d0ec4ac089b88148209e5ef057ae98f275f415a6..83113c1250dc46b253dff698e61eba910dfc5906 100644 (file)
--- a/ChangeLog.jp
+++ b/ChangeLog.jp
@@ -1,6 +1,13 @@
+2001-10-10
+
+       * src/utils.c: to_human_readable(): ¾¯¤·ºÇŬ²½¡£
+       * src/summaryview.c: summary_delete(): ¥Õ¥©¡¼¥«¥¹¤ÎÌäÂê¤ò½¤Àµ¡£
+

 2001-10-09
 
        * ¤¤¤¯¤Ä¤«¤Î autotool ¥¹¥¯¥ê¥×¥È¤ò¹¹¿·¡£
 2001-10-09
 
        * ¤¤¤¯¤Ä¤«¤Î autotool ¥¹¥¯¥ê¥×¥È¤ò¹¹¿·¡£

+       * src/codeconv.c: conv_encode_header(): ¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤ÎÊÑ´¹¤Ë
+         ¼ºÇÔ¤·¤¿¾ì¹ç¤Ë̵¸Â¥ë¡¼¥×¤òµ¯¤³¤¹¥Ð¥°¤ò½¤Àµ¡£

 
 2001-10-08
 
 
 2001-10-08
 

diff --git a/INSTALL b/INSTALL
index 0b6ba5d5ee981bae5aaa28628c897f60e26687c7..53c947188741710d4d50ca5baf260b1bcf909f71 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -101,8 +101,8 @@ If you want to enable SSL support, append the option
 If you want to enable IPv6 support, append the option
 --enable-ipv6 after ./configure.
 
 If you want to enable IPv6 support, append the option
 --enable-ipv6 after ./configure.
 

-If you want to enable GnuPG support, you need GPGME 0.2.1 or later, and
-GnuPG 1.0.4f or later. You can get them from the following location:
+If you want to enable GnuPG support, you need GPGME 0.2.3 or later, and
+GnuPG 1.0.6 or later. You can get them from the following location:

 
   ftp://ftp.gnupg.org/pub/gcrypt/alpha/gpgme/
   ftp://ftp.gnupg.org/pub/gcrypt/devel/
 
   ftp://ftp.gnupg.org/pub/gcrypt/alpha/gpgme/
   ftp://ftp.gnupg.org/pub/gcrypt/devel/

diff --git a/INSTALL.jp b/INSTALL.jp
index d8dc0ed7966d76c2124f52acaec2512612b20d74..7adcbce0a249db0ef1ef03f6b7c003c79831e947 100644 (file)
--- a/INSTALL.jp
+++ b/INSTALL.jp
@@ -101,7 +101,7 @@ SSL 
 IPv6 Âбþ¤òÍ­¸ú¤Ë¤·¤¿¤¤¾ì¹ç¤Ï¡¢ ./configure ¤Î¸å¤Ë
 --enable-ipv6 ¥ª¥×¥·¥ç¥ó¤òÄɲ䷤Ƥ¯¤À¤µ¤¤¡£
 
 IPv6 Âбþ¤òÍ­¸ú¤Ë¤·¤¿¤¤¾ì¹ç¤Ï¡¢ ./configure ¤Î¸å¤Ë
 --enable-ipv6 ¥ª¥×¥·¥ç¥ó¤òÄɲ䷤Ƥ¯¤À¤µ¤¤¡£
 

-GnuPG Âбþ¤òÍ­¸ú¤Ë¤·¤¿¤¤¾ì¹ç¤Ï¡¢ GPGME 0.2.1 °Ê¹ß¤È GnuPG 1.0.4f °Ê¹ß¤¬
+GnuPG Âбþ¤òÍ­¸ú¤Ë¤·¤¿¤¤¾ì¹ç¤Ï¡¢ GPGME 0.2.3 °Ê¹ß¤È GnuPG 1.0.6 °Ê¹ß¤¬

 ɬÍפǤ¹¡£°Ê²¼¤Î¾ì½ê¤«¤é¼èÆÀ¤Ç¤­¤Þ¤¹:
 
   ftp://ftp.gnupg.org/pub/gcrypt/alpha/gpgme/
 ɬÍפǤ¹¡£°Ê²¼¤Î¾ì½ê¤«¤é¼èÆÀ¤Ç¤­¤Þ¤¹:
 
   ftp://ftp.gnupg.org/pub/gcrypt/alpha/gpgme/

diff --git a/configure.in b/configure.in
index 1f92826c9c9ef796e71b899a1c396188bef458c0..b3f345114eea896b313d7909302a3d37769b388a 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=6
 MICRO_VERSION=3
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=3
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=claws5
+EXTRA_VERSION=claws6

 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl

diff --git a/src/codeconv.c b/src/codeconv.c
index becdccfae66a362881eaeb9341dcdda12b1a3be4..2d1d11d8bf9ded8a6185e17f974ae88153a29580 100644 (file)
--- a/src/codeconv.c
+++ b/src/codeconv.c
@@ -379,7 +379,7 @@ gchar *conv_codeset_strdup(const gchar *inbuf,
 #else /* !HAVE_LIBJCONV */
        if (src_codeset) {
                if (!strcasecmp(src_codeset, CS_EUC_JP) ||
 #else /* !HAVE_LIBJCONV */
        if (src_codeset) {
                if (!strcasecmp(src_codeset, CS_EUC_JP) ||

-                   !strcasecmp(src_codeset, "EUCJP"))
+                   !strcasecmp(src_codeset, CS_EUCJP))

                        src_charset = C_EUC_JP;
                else if (!strcasecmp(src_codeset, CS_SHIFT_JIS) ||
                         !strcasecmp(src_codeset, "SHIFT-JIS") ||
                        src_charset = C_EUC_JP;
                else if (!strcasecmp(src_codeset, CS_SHIFT_JIS) ||
                         !strcasecmp(src_codeset, "SHIFT-JIS") ||


@@ -435,7 +435,7 @@ CodeConvFunc conv_get_code_conv_func(const gchar *charset)
                 !strcasecmp(charset, "X-SJIS"))
                code_conv = conv_sjistodisp;
        else if (!strcasecmp(charset, CS_EUC_JP) ||
                 !strcasecmp(charset, "X-SJIS"))
                code_conv = conv_sjistodisp;
        else if (!strcasecmp(charset, CS_EUC_JP) ||

-                !strcasecmp(charset, "EUCJP"))
+                !strcasecmp(charset, CS_EUCJP))

                code_conv = conv_euctodisp;
        else
                code_conv = conv_noconv;
                code_conv = conv_euctodisp;
        else
                code_conv = conv_noconv;


@@ -467,6 +467,7 @@ static const struct {
        {C_ISO_2022_JP,         CS_ISO_2022_JP},
        {C_ISO_2022_JP_2,       CS_ISO_2022_JP_2},
        {C_EUC_JP,              CS_EUC_JP},
        {C_ISO_2022_JP,         CS_ISO_2022_JP},
        {C_ISO_2022_JP_2,       CS_ISO_2022_JP_2},
        {C_EUC_JP,              CS_EUC_JP},

+       {C_EUC_JP,              CS_EUCJP},

        {C_SHIFT_JIS,           CS_SHIFT_JIS},
        {C_ISO_2022_KR,         CS_ISO_2022_KR},
        {C_EUC_KR,              CS_EUC_KR},
        {C_SHIFT_JIS,           CS_SHIFT_JIS},
        {C_ISO_2022_KR,         CS_ISO_2022_KR},
        {C_EUC_KR,              CS_EUC_KR},


@@ -883,6 +884,7 @@ void conv_encode_header(gchar *dest, gint len, const gchar *src,
                                    != 0) {
                                        g_warning("can't convert\n");
                                        tmpp[0] = '\0';
                                    != 0) {
                                        g_warning("can't convert\n");
                                        tmpp[0] = '\0';

+                                       wtmpp++;

                                        continue;
                                }
                                if (!str_ascii) {
                                        continue;
                                }
                                if (!str_ascii) {

diff --git a/src/codeconv.h b/src/codeconv.h
index 5ff3dccd339cd98c93b533f9dfbc8d5211c9e1ef..518697707fd6a9177c71f6f9e52811c9cca03388 100644 (file)
--- a/src/codeconv.h
+++ b/src/codeconv.h
@@ -96,6 +96,7 @@ struct _CodeConverter
 #define CS_ISO_2022_JP         "ISO-2022-JP"
 #define CS_ISO_2022_JP_2       "ISO-2022-JP-2"
 #define CS_EUC_JP              "EUC-JP"
 #define CS_ISO_2022_JP         "ISO-2022-JP"
 #define CS_ISO_2022_JP_2       "ISO-2022-JP-2"
 #define CS_EUC_JP              "EUC-JP"

+#define CS_EUCJP               "EUCJP"

 #define CS_SHIFT_JIS           "Shift_JIS"
 #define CS_ISO_2022_KR         "ISO-2022-KR"
 #define CS_EUC_KR              "EUC-KR"
 #define CS_SHIFT_JIS           "Shift_JIS"
 #define CS_ISO_2022_KR         "ISO-2022-KR"
 #define CS_EUC_KR              "EUC-KR"

diff --git a/src/summaryview.c b/src/summaryview.c
index 88a3b64f0186b14fec0bc96521a96b84435e524d..55f9bcc4445f4aa7856b62cee399eefae7b7ca95 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -2698,7 +2698,7 @@ void summary_delete(SummaryView *summaryview)
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
        FolderItem *item = summaryview->folder_item;
        GList *cur;
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
        FolderItem *item = summaryview->folder_item;
        GList *cur;

-       GtkCTreeNode *dsp_last, *sel_last;
+       GtkCTreeNode *dsp_last, *sel_last = NULL;

 
        if (!item || item->folder->type == F_NEWS) return;
 
 
        if (!item || item->folder->type == F_NEWS) return;
 


@@ -2716,16 +2716,15 @@ void summary_delete(SummaryView *summaryview)
 
        /* next code sets current row focus right. if the last selection
         * is also the last displayed row, we need to scroll backwards. 
 
        /* next code sets current row focus right. if the last selection
         * is also the last displayed row, we need to scroll backwards. 

-        * exception: if the last displayed row is an uncollapsed node,
+        * exception: if the last displayed row has children,

         * we don't scroll back. */
        dsp_last = gtk_ctree_node_nth(ctree, GTK_CLIST(ctree)->rows - 1);
         * we don't scroll back. */
        dsp_last = gtk_ctree_node_nth(ctree, GTK_CLIST(ctree)->rows - 1);

-       sel_last = NULL;

        for (cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next) {
                sel_last = GTK_CTREE_NODE(cur->data);
        for (cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next) {
                sel_last = GTK_CTREE_NODE(cur->data);

-               summary_delete_row(summaryview, GTK_CTREE_NODE(sel_last));
+               summary_delete_row(summaryview, sel_last);

        }
 
        }
 

-       if (dsp_last == sel_last && GTK_CTREE_ROW(sel_last)->expanded) 
+       if (dsp_last == sel_last && !GTK_CTREE_ROW(sel_last)->children)

                summary_step(summaryview, GTK_SCROLL_STEP_BACKWARD);
        else    
                summary_step(summaryview, GTK_SCROLL_STEP_FORWARD);
                summary_step(summaryview, GTK_SCROLL_STEP_BACKWARD);
        else    
                summary_step(summaryview, GTK_SCROLL_STEP_FORWARD);

diff --git a/src/utils.c b/src/utils.c
index fa1fa5dd6185b37d39ab9a5c7f88450af9ee6345..45dad27ae257c0b4c147d43fd95d59583306287f 100644 (file)
--- a/src/utils.c
+++ b/src/utils.c
@@ -136,24 +136,21 @@ gchar *itos(gint n)
 gchar *to_human_readable(off_t size)
 {
        static gchar str[10];
 gchar *to_human_readable(off_t size)
 {
        static gchar str[10];

-       gint count;
-       guint32 div = 1;
+       gint shift;

 
 

-       for (count = 0; count < 3; count++) {
-               if (size / div < 1024)
+       for (shift = 0; shift < 30; shift += 10) {
+               if (size >> shift < 1024)

                        break;
                        break;

-               else
-                       div *= 1024;

        }
 
        }
 

-       switch (count) {
-       case 0: g_snprintf(str, sizeof(str), "%dB",    (gint)size);   break;
-       case 1: g_snprintf(str, sizeof(str), "%.1fKB", (gfloat)size / div);
+       switch (shift) {
+       case 0 : g_snprintf(str, sizeof(str), "%dB",    (gint)size);   break;
+       case 10: g_snprintf(str, sizeof(str), "%.1fKB", (gfloat)size / (1 << 10));

                break;
                break;

-       case 2: g_snprintf(str, sizeof(str), "%.2fMB", (gfloat)size / div);
+       case 20: g_snprintf(str, sizeof(str), "%.2fMB", (gfloat)size / (1 << 20));

                break;
        default:
                break;
        default:

-               g_snprintf(str, sizeof(str), "%.2fGB", (gfloat)size / div);
+               g_snprintf(str, sizeof(str), "%.2fGB", (gfloat)size / (1 << 30));

                break;
        }
 
                break;
        }