sync with 0.7.6cvs25

diff --git a/ChangeLog b/ChangeLog
index b11374ba731d0e232e259abf4fad7fde10c9d07a..6b7a56f632c01257fc10e72bb308e8eab6f56243 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2002-06-07
+
+       * src/folder.c: folder_set_missing_folders(): fixed a bug that
+         caused multiplication of special folders on startup if their
+         types were changed.
+       * src/folderview.c: folderview_remove_mailbox_cb(): modified the
+         label.
+
 2002-06-04
 
        * src/compose.c: compose_reply(), compose_forward(): reverted the

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 685ea6856f849969376a523a009edaea098cd5d7..41d1845fa400cc208c7ee1f8b995ab6f7d45331c 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2002-06-08 [paul]      0.7.6claws32
+
+       * sync with 0.7.6cvs25
+               see ChangeLog 2002-06-07
+
 2002-06-05 [paul]      0.7.6claws31
 
        * src/mainwindow.c

diff --git a/ChangeLog.jp b/ChangeLog.jp
index d37a2243a7160702d45b9c3effe509990e160fda..daab51199ada92dedc1f418fdc5c4fd03559e215 100644 (file)
--- a/ChangeLog.jp
+++ b/ChangeLog.jp
@@ -1,3 +1,9 @@
+2002-06-07
+
+       * src/folder.c: folder_set_missing_folders(): ÆÃÊÌ¥Õ¥©¥ë¥À¤Î¥¿¥¤¥×
+         ¤¬Êѹ¹¤µ¤ì¤¿¾ì¹ç¡¢µ¯Æ°»þ¤Ë¤½¤ì¤é¤¬Áý¿£¤¹¤ë¥Ð¥°¤ò½¤Àµ¡£
+       * src/folderview.c: folderview_remove_mailbox_cb(): ¥é¥Ù¥ë¤ò½¤Àµ¡£
+
 2002-06-04
 
        * src/compose.c: compose_reply(), compose_forward(): lockup ¤òµ¯¤³¤¹

diff --git a/NEWS b/NEWS
index 50a8d7cbfb827d9518c1d847074e2ce7a739383f..54b964c12527c1470ee3d8871f61ea442b86a13a 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,37 @@
 Changes of Sylpheed
 
+* 0.7.7
+
+    * The 'Redirect' (aka Bounce) feature has been implemented.
+    * IMAP4 / POP3 STARTTLS command has been enabled.
+    * NNTP over SSL has been enabled.
+    * The sorting order of the summary view became persistent.
+    * The 'Expand / Collapse all threads' feature have been added.
+    * The sorting order of the folder tree became case insensitive.
+    * The common / account preferences button has been removed from the
+      toolbar.
+    * Some fixes and improvements for MIME view have been made.
+    * The behavior of 'Folder tree' and 'Message view' toggle menu have been
+      fixed.
+    * The behavior of address completion has been fixed.
+    * A bug in the header MIME encoding routine on Japanese locale has been
+      fixed.
+    * Some other bugfixes have been made.
+
+* 0.7.6
+
+    * The manual and FAQ have been updated, and German and Italian FAQ have
+      been added.
+    * IMAP shared folder has been supported.
+    * 'Create filter rule' has been added to the context menu.
+    * Only newsgroup names longer than specified length are abbreviated.
+    * 'Get all' doesn't check for new messages on IMAP or News account by
+      default.
+    * Minor improvements to the folder property dialog have been made.
+    * Special characters like parentheses can be used in password for IMAP
+      accounts now.
+    * Some crash bugs and other minor bugs have been fixed.
+
 * 0.7.5
 
     * The license has been modified so that it will be compatible with

diff --git a/configure.in b/configure.in
index 847c89db5ccb2ac09e976a5da7956d1623de3537..229ae6af2602323d95a692569660ead1ce3eec7c 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=7
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws31
+EXTRA_VERSION=claws32
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/src/folder.c b/src/folder.c
index 8b43236bd95678589f2624cc08296bcafd10664c..c2902486175bb4ea46cca81cfff41d585b6ede09 100644 (file)
--- a/src/folder.c
+++ b/src/folder.c
@@ -678,12 +678,11 @@ void folder_set_missing_folders(void)
                }
 
                CREATE_FOLDER_IF_NOT_EXIST(inbox,  INBOX_DIR,  F_INBOX);
-               CREATE_FOLDER_IF_NOT_EXIST(outbox, OUTBOX_DIR, F_INBOX);
-               CREATE_FOLDER_IF_NOT_EXIST(draft,  DRAFT_DIR,  F_INBOX);
-               CREATE_FOLDER_IF_NOT_EXIST(queue,  QUEUE_DIR,  F_INBOX);
-               CREATE_FOLDER_IF_NOT_EXIST(trash,  TRASH_DIR,  F_INBOX);
+               CREATE_FOLDER_IF_NOT_EXIST(outbox, OUTBOX_DIR, F_OUTBOX);
+               CREATE_FOLDER_IF_NOT_EXIST(draft,  DRAFT_DIR,  F_DRAFT);
+               CREATE_FOLDER_IF_NOT_EXIST(queue,  QUEUE_DIR,  F_QUEUE);
+               CREATE_FOLDER_IF_NOT_EXIST(trash,  TRASH_DIR,  F_TRASH);
        }
-
 }
 
 #undef CREATE_FOLDER_IF_NOT_EXIST

diff --git a/src/folderview.c b/src/folderview.c
index 5ce56cb0f405f2a5c1b6ca65b60b0d9eb578d8b3..5a7e5d16d1d18e4595c88e25bc6d395888930d41 100644 (file)
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -2092,7 +2092,7 @@ static void folderview_remove_mailbox_cb(FolderView *folderview, guint action,
        message = g_strdup_printf
                (_("Really remove the mailbox `%s' ?\n"
                   "(The messages are NOT deleted from the disk)"), name);
-       avalue = alertpanel(_("Remove folder"), message,
+       avalue = alertpanel(_("Remove mailbox"), message,
                            _("Yes"), _("+No"), NULL);
        g_free(message);
        if (avalue != G_ALERTDEFAULT) return;