Save a dereference, and close #3226 with voodoo.

diff --git a/ChangeLog b/ChangeLog
index 0f53a6ca2d672d664b1d735c3c724d41e066587f..bbb9b99f5428bd65298f367cd78c558023b9729b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,11 @@
-2009-06-13 14:36 -0700  Brendan Cully  <brendan@kublai.com>  (b12adeefffda)
+2009-06-14 08:47 -0700  Brendan Cully  <brendan@kublai.com>  (45969ea3195e)
+
+       * sendlib.c: Initialize pointer before use under -d4
+
+2009-06-13 19:52 -0700  Brendan Cully  <brendan@kublai.com>  (83ffb5593bc6)
+
+       * curs_main.c: Adjust menu position after sync more
+       carefully. Closes #3092.
 
        * init.h: Force status to redraw when $postponed changes.
 

diff --git a/imap/imap.c b/imap/imap.c
index 0492cd7394572bda1c78fbf48ce0cffcc8566fd4..f08b4ead012eb1acbfd0d5929ce7024af3b56b63 100644 (file)
--- a/imap/imap.c
+++ b/imap/imap.c
@@ -1170,7 +1170,7 @@ int imap_sync_mailbox (CONTEXT* ctx, int expunge, int* index_hint)
     return -1;
   }
 
-  /* This function is only called when the calling code        expects the context
+  /* This function is only called when the calling code expects the context
    * to be changed. */
   imap_allow_reopen (ctx);
 
@@ -1178,7 +1178,7 @@ int imap_sync_mailbox (CONTEXT* ctx, int expunge, int* index_hint)
     return rc;
 
   /* if we are expunging anyway, we can do deleted messages very quickly... */
-  if (expunge && mutt_bit_isset (idata->ctx->rights, M_ACL_DELETE))
+  if (expunge && mutt_bit_isset (ctx->rights, M_ACL_DELETE))
   {
     if ((rc = imap_exec_msgset (idata, "UID STORE", "+FLAGS.SILENT (\\Deleted)",
                                 M_DELETED, 1, 0)) < 0)
@@ -1294,7 +1294,7 @@ int imap_sync_mailbox (CONTEXT* ctx, int expunge, int* index_hint)
 
   /* We must send an EXPUNGE command if we're not closing. */
   if (expunge && !(ctx->closing) &&
-      mutt_bit_isset(idata->ctx->rights, M_ACL_DELETE))
+      mutt_bit_isset(ctx->rights, M_ACL_DELETE))
   {
     mutt_message _("Expunging messages from server...");
     /* Set expunge bit so we don't get spurious reopened messages */