sync with sylpheed 0.6.2cvs6

diff --git a/ChangeLog b/ChangeLog
index d750ad7d31900a6bf62729e9cd1f7bdbcc6233f4..6a285fadbf004d494d03109de40ab5c6cc2ecb63 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-09-27
+
+       * src/folder.c: folder_write_list_recursive(): preserve unthreaded
+         state.
+
 2001-09-26
 
        * src/summaryview.c: modified the layout of popup menu.

diff --git a/ChangeLog.jp b/ChangeLog.jp
index b51039d636d33f232f431946234bb0bd5a322351..aa0b62c0013ce646292a113e0c250031070137ca 100644 (file)
--- a/ChangeLog.jp
+++ b/ChangeLog.jp
@@ -1,3 +1,8 @@
+2001-09-27
+
+       * src/folder.c: folder_write_list_recursive(): ¥¹¥ì¥Ã¥É²ò½ü¤Î¾õÂÖ
+         ¤òÊݸ¡£
+
 2001-09-26
 
        * src/summaryview.c: ¥Ý¥Ã¥×¥¢¥Ã¥×¥á¥Ë¥å¡¼¤Î¹½À®¤òÊѹ¹¡£

diff --git a/src/folder.c b/src/folder.c
index 7afe51781d279d6ed65f391a6537d44c636f13d7..e7e7414a77b53a09f03e5fa932931d2e4245a33a 100644 (file)
--- a/src/folder.c
+++ b/src/folder.c
@@ -1249,8 +1249,6 @@ static void folder_write_list_recursive(GNode *node, gpointer data)
                                folder->account->account_id);
                if (item->collapsed && node->children)
                        fputs(" collapsed=\"1\"", fp);
-               if (item->threaded)
-                       fputs(" threaded=\"1\"", fp);
                if (item->ret_rcpt) 
                        fputs(" reqretrcpt=\"1\"", fp);
        } else {
@@ -1277,6 +1275,8 @@ static void folder_write_list_recursive(GNode *node, gpointer data)
                        fputs(" collapsed=\"1\"", fp);
                if (item->threaded)
                        fputs(" threaded=\"1\"", fp);
+               else
+                       fputs(" threaded=\"0\"", fp);
                if (item->ret_rcpt)
                        fputs(" reqretrcpt=\"1\"", fp);
                fprintf(fp,