Do not display error message when user declines to create target mailbox.

diff --git a/ChangeLog b/ChangeLog
index 9e8a26d82a729bcb6f0f292c3472800425729299..fad0720ea77a7d57c88dbefb23cf89407b7a457d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2009-06-07 10:51 -0700  Brendan Cully  <brendan@kublai.com>  (4207435525e4)
+
+       * imap/message.c: Minor cleanup in imap_copy_messages.
+
+2009-06-07 08:14 +0200  Miroslav Lichvar  <mlichvar@redhat.com>  (16592f0dfdaf)
+
+       * configure.ac, mutt_ssl_gnutls.c: Disable checking certificate
+       activation/expiration times in gnutls as we do the checks ourselves.
+
+2009-06-06 22:31 -0700  Brendan Cully  <brendan@kublai.com>  (e5c2befbf0f5)
+
+       * imap/message.c: Do not treat already-seen headers as if they are
+       new. See #2935.
+
 2009-06-07 02:09 +0200  Rocco Rutte  <pdmef@gmx.net>  (a786b0e8627c)
 
        * doc/dotlock.man, doc/makedoc.c, doc/mbox.man, doc/mmdf.man,
@@ -20,8 +34,6 @@
        * UPDATING, globals.h, init.h, pager.c: Don't abuse $pager_context for
        searches, add $search_context. See #976.
 
-2009-06-03 09:06 +0200  Rocco Rutte  <pdmef@gmx.net>  (9e45d5bedc79)
-
        * pattern.c: Fix compiler warning
 
 2009-06-02 20:25 +0200  Miroslav Lichvar  <mlichvar@redhat.com>  (d1d0481d1ca1)

diff --git a/imap/message.c b/imap/message.c
index aca8023bead41d4c7ed131dc2084b5779849f4bc..3d64c0d5f62cc1dfd19a3b392b96192dfe81d9c4 100644 (file)
--- a/imap/message.c
+++ b/imap/message.c
@@ -843,7 +843,7 @@ int imap_copy_messages (CONTEXT* ctx, HEADER* h, char* dest, int delete)
       if (option (OPTCONFIRMCREATE) && mutt_yesorno (prompt, 1) < 1)
       {
         mutt_clear_error ();
-        break;
+        goto out;
       }
       if (imap_create_mailbox (idata, mbox) < 0)
         break;