From: Brendan Cully Date: Sun, 14 Jun 2009 17:43:07 +0000 (-0700) Subject: Save a dereference, and close #3226 with voodoo. X-Git-Tag: neomutt-20160307~575 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=195b09c99270890e694c31606511f87daf8ef0fb;p=neomutt Save a dereference, and close #3226 with voodoo. --- diff --git a/ChangeLog b/ChangeLog index 0f53a6ca2..bbb9b99f5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,11 @@ -2009-06-13 14:36 -0700 Brendan Cully (b12adeefffda) +2009-06-14 08:47 -0700 Brendan Cully (45969ea3195e) + + * sendlib.c: Initialize pointer before use under -d4 + +2009-06-13 19:52 -0700 Brendan Cully (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 0492cd739..f08b4ead0 100644 --- 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 */