sync with sylpheed 0.6.2cvs11

diff --git a/ChangeLog b/ChangeLog
index cea3d353d28207539ca5f58370cfea8ad91ad065..1913ef3db56beb67a2a220cae71d0e7f1ec2ec0b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-10-05
+
+       * src/summaryview.c: summary_show(): fixed a bug that didn't show
+         message even if the 'open unread message on entering folder'
+         option was turned on.
+
 2001-10-03
 
        * src/procmime.c: procmime_get_text_content(): supported HTML.

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 3034af3b478e75466a33a73bb0d969eb991f4655..00bdf512ca16151f041e459e41e4582fca079669 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,15 @@
+2001-10-06 [paul]      0.6.2claws21
+
+       * po/pt_BR.po
+               updated translation, contains some fixes and new
+               translations, submitted by Gustavo Noronha Silva
+               <kov@debian.org>
+
+       * src/prefs_common.c
+               change 'each' to 'every' - fix dubious English
+
+       * sync with sylpheed 0.6.2cvs11
+
 2001-10-05 [alfons]    0.6.2claws20
 
        * src/mainwindow.[ch], src/folderview.c

diff --git a/ChangeLog.jp b/ChangeLog.jp
index 9c754326d227ba764cde4bd48b838d00e1b4c919..f867732a5eff03856897170878ecc484ec0e4c64 100644 (file)
--- a/ChangeLog.jp
+++ b/ChangeLog.jp
@@ -1,3 +1,9 @@
+2001-10-05
+
+       * src/summaryview.c: summary_show(): ¡Ö¥Õ¥©¥ë¥À¤ËÆþ¤Ã¤¿¤È¤­¤Ë̤ÆÉ
+         ¥á¥Ã¥»¡¼¥¸¤ò³«¤¯¡×¥ª¥×¥·¥ç¥ó¤¬ ON ¤Ë¤Ê¤Ã¤Æ¤¤¤Æ¤â¥á¥Ã¥»¡¼¥¸¤ò
+         ɽ¼¨¤·¤Ê¤¤¥Ð¥°¤ò½¤Àµ¡£
+
 2001-10-03
 
        * src/procmime.c: procmime_get_text_content(): HTML ¤ËÂбþ¡£

diff --git a/NEWS b/NEWS
index 00d88f9f9a88a3eab55f4abc0366a5eb935d3bb6..f49d5df5f6e0947f514641834a8965277606152a 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,17 @@
 Changes of Sylpheed
 
+* 0.6.3
+
+    * Message body text search has been implemented.
+    * The text part of nested multipart message, or HTML only message
+      is now correctly quoted on replying.
+    * The status of threading is now preserved for each folders.
+    * User name and password of IMAP4 account which include spaces are now
+      handled correctly.
+    * Workaround for 8bit characters conversion failure on C locale when
+      using libjconv has been made.
+    * Some bugs that caused crashes have been fixed.
+
 * 0.6.2
 
     * The new addressbook has been implemented (Match Grun).

diff --git a/configure.in b/configure.in
index 9c7120119caab5f770dcdddbb74e6ad2c507a0ff..04181cd683060a9a4d089fdbd6af0a2fef443657 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=6
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws20
+EXTRA_VERSION=claws21
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl

diff --git a/src/summaryview.c b/src/summaryview.c
index 7a2cc68e58572c8a4234c6f901bd8e3e7fca61b1..18501a178ab8559e529a38178e2bdeb178c5e3e9 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -924,8 +924,12 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item,
 
                if (node == NULL && GTK_CLIST(ctree)->row_list != NULL)
                        node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list_end);
-               summary_select_node(summaryview, node,
-                                   prefs_common.open_unread_on_enter);
+               if (prefs_common.open_unread_on_enter) {
+                       summary_unlock(summaryview);
+                       summary_select_node(summaryview, node, TRUE);
+                       summary_lock(summaryview);
+               } else
+                       summary_select_node(summaryview, node, FALSE);
        }
 
        summary_status_show(summaryview);