mutt_str_strfcpy(mailbox, "INBOX", sizeof(mailbox));
/* we may already be in the folder we're checking */
- if (mutt_str_strcmp(idata->mailbox, mx.mbox) == 0)
+ if (mutt_str_strcmp(idata->mbox_name, mx.mbox) == 0)
{
FREE(&mx.mbox);
return 0;
* IDLEd elsewhere.
* idata->mailbox may be NULL for connections other than the current
* mailbox's, and shouldn't expand to INBOX in that case. #3216. */
- if (idata->mailbox && (imap_mxcmp(name, idata->mailbox) == 0))
+ if (idata->mbox_name && (imap_mxcmp(name, idata->mbox_name) == 0))
{
np->m->has_new = false;
continue;
*
* Note that imap_mxcmp() converts NULL to "INBOX", so we need to
* make sure the idata really is open to a folder. */
- if (idata->ctx && !imap_mxcmp(buf, idata->mailbox))
+ if (idata->ctx && !imap_mxcmp(buf, idata->mbox_name))
return idata->ctx->mailbox->msg_count;
else if (mutt_bit_isset(idata->capabilities, IMAP4REV1) ||
mutt_bit_isset(idata->capabilities, STATUS))
imap_fix_path(idata, mx.mbox, buf, sizeof(buf));
if (!*buf)
mutt_str_strfcpy(buf, "INBOX", sizeof(buf));
- FREE(&(idata->mailbox));
- idata->mailbox = mutt_str_strdup(buf);
- imap_qualify_path(buf, sizeof(buf), &mx, idata->mailbox);
+ FREE(&(idata->mbox_name));
+ idata->mbox_name = mutt_str_strdup(buf);
+ imap_qualify_path(buf, sizeof(buf), &mx, idata->mbox_name);
mutt_str_strfcpy(ctx->mailbox->path, buf, sizeof(ctx->mailbox->path));
mutt_str_strfcpy(ctx->mailbox->realpath, ctx->mailbox->path,
idata->new_mail_count = 0;
idata->max_msn = 0;
- mutt_message(_("Selecting %s..."), idata->mailbox);
- imap_munge_mbox_name(idata, buf, sizeof(buf), idata->mailbox);
+ mutt_message(_("Selecting %s..."), idata->mbox_name);
+ imap_munge_mbox_name(idata, buf, sizeof(buf), idata->mbox_name);
/* pipeline ACL test */
if (mutt_bit_isset(idata->capabilities, ACL))
imap_cmd_start(idata, bufout);
- status = imap_mboxcache_get(idata, idata->mailbox, true);
+ status = imap_mboxcache_get(idata, idata->mbox_name, true);
do
{
}
idata->reopen &= IMAP_REOPEN_ALLOW;
- FREE(&(idata->mailbox));
+ FREE(&(idata->mbox_name));
mutt_list_free(&idata->flags);
idata->ctx = NULL;
if (idata->bcache)
return idata->bcache;
- imap_cachepath(idata, idata->mailbox, mailbox, sizeof(mailbox));
+ imap_cachepath(idata, idata->mbox_name, mailbox, sizeof(mailbox));
return mutt_bcache_open(&idata->conn->account, mailbox);
}
if (read_headers_fetch_new(idata, msn_begin, msn_end, evalhc, &maxuid, initial_download) < 0)
goto bail;
- if (maxuid && (status = imap_mboxcache_get(idata, idata->mailbox, 0)) &&
+ if (maxuid && (status = imap_mboxcache_get(idata, idata->mbox_name, 0)) &&
(status->uidnext < maxuid + 1))
{
status->uidnext = maxuid + 1;
* @retval true Success
* @retval false Failure
*/
-static bool read_threads_query(struct Mailbox *mailbox, notmuch_query_t *q, bool dedup, int limit)
+static bool read_threads_query(struct Mailbox *mailbox, notmuch_query_t *q,
+ bool dedup, int limit)
{
struct NmMboxData *data = get_mboxdata(mailbox);
notmuch_threads_t *threads = NULL;
threads = notmuch_query_search_threads(q);
#endif
- for (; notmuch_threads_valid(threads) &&
- ((limit == 0) || (mailbox->msg_count < limit));
+ for (; notmuch_threads_valid(threads) && ((limit == 0) || (mailbox->msg_count < limit));
notmuch_threads_move_to_next(threads))
{
if (SigInt == 1)
* @retval 0 Success
* @retval -1 Failure
*/
-int nm_update_filename(struct Mailbox *mailbox, const char *old, const char *new,
- struct Header *h)
+int nm_update_filename(struct Mailbox *mailbox, const char *old,
+ const char *new, struct Header *h)
{
char buf[PATH_MAX];
int rc;