move Context.ctx->data

diff --git a/browser.c b/browser.c
index f405bb67b97d26f77a5f71ff377df0cbe26f073e..96ad11d86da8d63e455913747bcac7182121f38c 100644 (file)
--- a/browser.c
+++ b/browser.c
@@ -654,7 +654,7 @@ static const char *group_index_format_str(char *buf, size_t buflen, size_t col,
       break;
 
     case 'n':
-      if (Context && Context->data == folder->ff->nd)
+      if (Context && Context->mailbox->data == folder->ff->nd)
       {
         snprintf(fmt, sizeof(fmt), "%%%sd", prec);
         snprintf(buf, buflen, fmt, Context->new);
@@ -686,7 +686,7 @@ static const char *group_index_format_str(char *buf, size_t buflen, size_t col,
                               group_index_format_str, data, flags);
         }
       }
-      else if (Context && Context->data == folder->ff->nd)
+      else if (Context && Context->mailbox->data == folder->ff->nd)
       {
         snprintf(fmt, sizeof(fmt), "%%%sd", prec);
         snprintf(buf, buflen, fmt, Context->mailbox->msg_unread);

diff --git a/context.h b/context.h
index 7cef3ba8faa5f3515c924c3288a54954fc8c16cc..8a3299ed3372098711798bbffa6ca78af7938a73 100644 (file)
--- a/context.h
+++ b/context.h
@@ -98,9 +98,6 @@ struct Context
   void *compress_info; /**< compressed mbox module private data */
 #endif                 /**< USE_COMPRESSED */
 
-  /* driver hooks */
-  void *data; /**< driver specific data */
-
   struct Mailbox *mailbox;
 };
 

diff --git a/curs_main.c b/curs_main.c
index 3f765a75626530885d87be12a7c57dc31375a2c4..d76df90690dd576d36eb8dc942a3d2be1bfbc7a2 100644 (file)
--- a/curs_main.c
+++ b/curs_main.c
@@ -2990,7 +2990,7 @@ int mutt_index_menu(void)
         CHECK_ATTACH
         if (Context && Context->mailbox->magic == MUTT_NNTP)
         {
-          struct NntpData *nntp_data = Context->data;
+          struct NntpData *nntp_data = Context->mailbox->data;
           if (mutt_newsgroup_catchup(nntp_data->nserv, nntp_data->group))
             menu->redraw = REDRAW_INDEX | REDRAW_STATUS;
         }
@@ -3301,7 +3301,7 @@ int mutt_index_menu(void)
                              _("Reply by mail as poster prefers?")) != MUTT_YES)
         {
           if (Context && Context->mailbox->magic == MUTT_NNTP &&
-              !((struct NntpData *) Context->data)->allowed && query_quadoption(PostModerated, _("Posting to this group not allowed, may be moderated. Continue?")) != MUTT_YES)
+              !((struct NntpData *) Context->mailbox->data)->allowed && query_quadoption(PostModerated, _("Posting to this group not allowed, may be moderated. Continue?")) != MUTT_YES)
           {
             break;
           }

diff --git a/imap/imap.c b/imap/imap.c
index 173554fec466fb1e21f270f9006fd696bfaa2880..13a2fb2edc5893d837122a3fd9755da6dab54dc8 100644 (file)
--- a/imap/imap.c
+++ b/imap/imap.c
@@ -488,7 +488,7 @@ static int compile_search(struct Context *ctx, const struct Pattern *pat, struct
         break;
       case MUTT_SERVERSEARCH:
       {
-        struct ImapData *idata = ctx->data;
+        struct ImapData *idata = ctx->mailbox->data;
         if (!mutt_bit_isset(idata->capabilities, X_GM_EXT1))
         {
           mutt_error(_("Server-side custom search not supported: %s"), pat->p.str);
@@ -713,7 +713,7 @@ int imap_delete_mailbox(struct Context *ctx, struct ImapMbox *mx)
   char buf[PATH_MAX], mbox[PATH_MAX];
   struct ImapData *idata = NULL;
 
-  if (!ctx || !ctx->data)
+  if (!ctx || !ctx->mailbox->data)
   {
     idata = imap_conn_find(&mx->account, ImapPassive ? MUTT_IMAP_CONN_NONEW : 0);
     if (!idata)
@@ -724,7 +724,7 @@ int imap_delete_mailbox(struct Context *ctx, struct ImapMbox *mx)
   }
   else
   {
-    idata = ctx->data;
+    idata = ctx->mailbox->data;
   }
 
   imap_munge_mbox_name(idata, mbox, sizeof(mbox), mx->mbox);
@@ -1367,7 +1367,7 @@ int imap_sync_message_for_copy(struct ImapData *idata, struct Header *hdr,
  */
 int imap_check_mailbox(struct Context *ctx, bool force)
 {
-  return imap_check(ctx->data, force);
+  return imap_check(ctx->mailbox->data, force);
 }
 
 /**
@@ -1685,7 +1685,7 @@ void imap_mboxcache_free(struct ImapData *idata)
 int imap_search(struct Context *ctx, const struct Pattern *pat)
 {
   struct Buffer buf;
-  struct ImapData *idata = ctx->data;
+  struct ImapData *idata = ctx->mailbox->data;
   for (int i = 0; i < ctx->mailbox->msg_count; i++)
     ctx->hdrs[i]->matched = false;
 
@@ -1894,7 +1894,7 @@ int imap_fast_trash(struct Context *ctx, char *dest)
   struct Buffer *sync_cmd = NULL;
   int err_continue = MUTT_NO;
 
-  struct ImapData *idata = ctx->data;
+  struct ImapData *idata = ctx->mailbox->data;
 
   if (imap_parse_path(dest, &mx))
   {
@@ -2018,7 +2018,7 @@ static int imap_mbox_open(struct Context *ctx)
     goto fail;
 
   /* once again the context is new */
-  ctx->data = idata;
+  ctx->mailbox->data = idata;
 
   /* Clean up path and replace the one in the ctx */
   imap_fix_path(idata, mx.mbox, buf, sizeof(buf));
@@ -2261,7 +2261,7 @@ static int imap_mbox_open_append(struct Context *ctx, int flags)
     return -1;
   }
 
-  ctx->data = idata;
+  ctx->mailbox->data = idata;
 
   imap_fix_path(idata, mx.mbox, mailbox, sizeof(mailbox));
   if (!*mailbox)
@@ -2292,7 +2292,7 @@ static int imap_mbox_open_append(struct Context *ctx, int flags)
  */
 static int imap_mbox_close(struct Context *ctx)
 {
-  struct ImapData *idata = ctx->data;
+  struct ImapData *idata = ctx->mailbox->data;
   /* Check to see if the mailbox is actually open */
   if (!idata)
     return 0;
@@ -2380,7 +2380,7 @@ static int imap_mbox_check(struct Context *ctx, int *index_hint)
   (void) index_hint;
 
   imap_allow_reopen(ctx);
-  rc = imap_check(ctx->data, false);
+  rc = imap_check(ctx->mailbox->data, false);
   imap_disallow_reopen(ctx);
 
   return rc;
@@ -2401,7 +2401,7 @@ int imap_sync_mailbox(struct Context *ctx, bool expunge)
   int oldsort;
   int rc;
 
-  struct ImapData *idata = ctx->data;
+  struct ImapData *idata = ctx->mailbox->data;
 
   if (idata->state < IMAP_SELECTED)
   {
@@ -2597,7 +2597,7 @@ static int imap_tags_edit(struct Context *ctx, const char *tags, char *buf, size
 {
   char *new = NULL;
   char *checker = NULL;
-  struct ImapData *idata = ctx->data;
+  struct ImapData *idata = ctx->mailbox->data;
 
   /* Check for \* flags capability */
   if (!imap_has_flag(&idata->flags, NULL))
@@ -2684,7 +2684,7 @@ static int imap_tags_commit(struct Context *ctx, struct Header *hdr, char *buf)
   struct Buffer *cmd = NULL;
   char uid[11];
 
-  struct ImapData *idata = ctx->data;
+  struct ImapData *idata = ctx->mailbox->data;
 
   if (*buf == '\0')
     buf = NULL;

diff --git a/imap/message.c b/imap/message.c
index ed233afb2e8f714ed35035d3456c778bfd2cd42c..df8420dc4252e4aa66515c6e475513b12c1c08e2 100644 (file)
--- a/imap/message.c
+++ b/imap/message.c
@@ -393,7 +393,7 @@ static int msg_fetch_header(struct Context *ctx, struct ImapHeader *h, char *buf
   int rc = -1; /* default now is that string isn't FETCH response */
   int parse_rc;
 
-  struct ImapData *idata = ctx->data;
+  struct ImapData *idata = ctx->mailbox->data;
 
   if (buf[0] != '*')
     return rc;
@@ -1350,7 +1350,7 @@ int imap_msg_open(struct Context *ctx, struct Message *msg, int msgno)
   bool fetched = false;
   int output_progress;
 
-  struct ImapData *idata = ctx->data;
+  struct ImapData *idata = ctx->mailbox->data;
   struct Header *h = ctx->hdrs[msgno];
 
   msg->fp = msg_cache_get(idata, h);
@@ -1604,7 +1604,7 @@ int imap_append_message(struct Context *ctx, struct Message *msg)
   struct ImapMbox mx;
   int rc;
 
-  struct ImapData *idata = ctx->data;
+  struct ImapData *idata = ctx->mailbox->data;
 
   if (imap_parse_path(ctx->mailbox->path, &mx))
     return -1;
@@ -1738,7 +1738,7 @@ int imap_copy_messages(struct Context *ctx, struct Header *h, char *dest, bool d
   int err_continue = MUTT_NO;
   int triedcreate = 0;
 
-  struct ImapData *idata = ctx->data;
+  struct ImapData *idata = ctx->mailbox->data;
 
   if (imap_parse_path(dest, &mx))
   {

diff --git a/imap/util.c b/imap/util.c
index 78d3deb5d6407cfea9dd04dbcb22a4a006ab7df7..04b2855a944805aa217e5c857a29b17a24699e9c 100644 (file)
--- a/imap/util.c
+++ b/imap/util.c
@@ -1108,10 +1108,10 @@ int imap_wait_keepalive(pid_t pid)
 void imap_allow_reopen(struct Context *ctx)
 {
   struct ImapData *idata = NULL;
-  if (!ctx || !ctx->data || ctx->mailbox->magic != MUTT_IMAP)
+  if (!ctx || !ctx->mailbox->data || ctx->mailbox->magic != MUTT_IMAP)
     return;
 
-  idata = ctx->data;
+  idata = ctx->mailbox->data;
   if (idata->ctx == ctx)
     idata->reopen |= IMAP_REOPEN_ALLOW;
 }
@@ -1123,10 +1123,10 @@ void imap_allow_reopen(struct Context *ctx)
 void imap_disallow_reopen(struct Context *ctx)
 {
   struct ImapData *idata = NULL;
-  if (!ctx || !ctx->data || ctx->mailbox->magic != MUTT_IMAP)
+  if (!ctx || !ctx->mailbox->data || ctx->mailbox->magic != MUTT_IMAP)
     return;
 
-  idata = ctx->data;
+  idata = ctx->mailbox->data;
   if (idata->ctx == ctx)
     idata->reopen &= ~IMAP_REOPEN_ALLOW;
 }

diff --git a/mailbox.h b/mailbox.h
index 13a5c44671fdb0e624cdb8efa759772f6808ebe4..8da21d3e793de8cd24059114b4faad18fefd57c9 100644 (file)
--- a/mailbox.h
+++ b/mailbox.h
@@ -70,6 +70,8 @@ struct Mailbox
   struct timespec last_visited;       /**< time of last exit from this mailbox */
   struct timespec stats_last_checked; /**< mtime of mailbox the last time stats where checked. */
 
+  /* driver hooks */
+  void *data; /**< driver specific data */
   const struct MxOps *mx_ops;
 
   int flags; /**< e.g. #MB_NORMAL */

diff --git a/maildir/mh.c b/maildir/mh.c
index bd8f200fd2b2c7737c7e6c39aafa6c7fb0df227e..446b3106de9491e87cc823ce052f24fc52612386 100644 (file)
--- a/maildir/mh.c
+++ b/maildir/mh.c
@@ -119,7 +119,7 @@ struct MhData
  */
 static inline struct MhData *mh_data(struct Context *ctx)
 {
-  return ctx->data;
+  return ctx->mailbox->data;
 }
 
 /**
@@ -1419,7 +1419,7 @@ static void maildir_delayed_parsing(struct Context *ctx, struct Maildir **md,
  */
 static int mh_mbox_close(struct Context *ctx)
 {
-  FREE(&ctx->data);
+  FREE(&ctx->mailbox->data);
 
   return 0;
 }
@@ -1448,9 +1448,9 @@ static int mh_read_dir(struct Context *ctx, const char *subdir)
     mutt_progress_init(&progress, msgbuf, MUTT_PROGRESS_MSG, ReadInc, 0);
   }
 
-  if (!ctx->data)
+  if (!ctx->mailbox->data)
   {
-    ctx->data = mutt_mem_calloc(1, sizeof(struct MhData));
+    ctx->mailbox->data = mutt_mem_calloc(1, sizeof(struct MhData));
   }
   data = mh_data(ctx);
 

diff --git a/mx.c b/mx.c
index f0103c0c069fc51265d90cdff51418ff3b7215d0..7e5d8cece302b900c5f0785bb1b2983910c7cf0a 100644 (file)
--- a/mx.c
+++ b/mx.c
@@ -536,7 +536,7 @@ int mx_mbox_close(struct Context **pctx, int *index_hint)
 #ifdef USE_NNTP
   if (ctx->mailbox->msg_unread && ctx->mailbox->magic == MUTT_NNTP)
   {
-    struct NntpData *nntp_data = ctx->data;
+    struct NntpData *nntp_data = ctx->mailbox->data;
 
     if (nntp_data && nntp_data->nserv && nntp_data->group)
     {

diff --git a/nntp/newsrc.c b/nntp/newsrc.c
index bc9bdb6ce8117f7a2e6878db8293720d378d5a17..f170263f0225a9000c8d9c8645bec696e35104f7 100644 (file)
--- a/nntp/newsrc.c
+++ b/nntp/newsrc.c
@@ -323,7 +323,7 @@ int nntp_newsrc_parse(struct NntpServer *nserv)
  */
 void nntp_newsrc_gen_entries(struct Context *ctx)
 {
-  struct NntpData *nntp_data = ctx->data;
+  struct NntpData *nntp_data = ctx->mailbox->data;
   anum_t last = 0, first = 1;
   bool series;
   int save_sort = SORT_ORDER;
@@ -1216,7 +1216,7 @@ struct NntpServer *nntp_select_server(char *server, bool leave_lock)
  */
 void nntp_article_status(struct Context *ctx, struct Header *hdr, char *group, anum_t anum)
 {
-  struct NntpData *nntp_data = ctx->data;
+  struct NntpData *nntp_data = ctx->mailbox->data;
 
   if (group)
     nntp_data = mutt_hash_find(nntp_data->nserv->groups_hash, group);
@@ -1324,7 +1324,7 @@ struct NntpData *mutt_newsgroup_catchup(struct NntpServer *nserv, char *group)
     nntp_data->newsrc_ent[0].last = nntp_data->last_message;
   }
   nntp_data->unread = 0;
-  if (Context && Context->data == nntp_data)
+  if (Context && Context->mailbox->data == nntp_data)
   {
     for (unsigned int i = 0; i < Context->mailbox->msg_count; i++)
       mutt_set_flag(Context, Context->hdrs[i], MUTT_READ, 1);
@@ -1357,7 +1357,7 @@ struct NntpData *mutt_newsgroup_uncatchup(struct NntpServer *nserv, char *group)
     nntp_data->newsrc_ent[0].first = 1;
     nntp_data->newsrc_ent[0].last = nntp_data->first_message - 1;
   }
-  if (Context && Context->data == nntp_data)
+  if (Context && Context->mailbox->data == nntp_data)
   {
     nntp_data->unread = Context->mailbox->msg_count;
     for (unsigned int i = 0; i < Context->mailbox->msg_count; i++)
@@ -1387,7 +1387,8 @@ void nntp_mailbox(char *buf, size_t buflen)
       continue;
 
     if (Context && Context->mailbox->magic == MUTT_NNTP &&
-        (mutt_str_strcmp(nntp_data->group, ((struct NntpData *) Context->data)->group) == 0))
+        (mutt_str_strcmp(nntp_data->group,
+                         ((struct NntpData *) Context->mailbox->data)->group) == 0))
     {
       unsigned int unread = 0;
 

diff --git a/nntp/nntp.c b/nntp/nntp.c
index 8ec75b23ce407804c186ce4a24e7a7abf346eb3e..c830c8cb23e8ed85834490e00094a90f879a84c5 100644 (file)
--- a/nntp/nntp.c
+++ b/nntp/nntp.c
@@ -1025,7 +1025,7 @@ static int get_description(struct NntpData *nntp_data, const char *wildmat, cons
  */
 static void nntp_parse_xref(struct Context *ctx, struct Header *hdr)
 {
-  struct NntpData *nntp_data = ctx->data;
+  struct NntpData *nntp_data = ctx->mailbox->data;
 
   char *buf = mutt_str_strdup(hdr->env->xref);
   char *p = buf;
@@ -1123,7 +1123,7 @@ static int parse_overview_line(char *line, void *data)
 {
   struct FetchCtx *fc = data;
   struct Context *ctx = fc->ctx;
-  struct NntpData *nntp_data = ctx->data;
+  struct NntpData *nntp_data = ctx->mailbox->data;
   struct Header *hdr = NULL;
   char *header = NULL, *field = NULL;
   bool save = true;
@@ -1277,7 +1277,7 @@ static int parse_overview_line(char *line, void *data)
 static int nntp_fetch_headers(struct Context *ctx, void *hc, anum_t first,
                               anum_t last, int restore)
 {
-  struct NntpData *nntp_data = ctx->data;
+  struct NntpData *nntp_data = ctx->mailbox->data;
   struct FetchCtx fc;
   struct Header *hdr = NULL;
   char buf[HUGE_STRING];
@@ -1604,7 +1604,7 @@ static int nntp_mbox_open(struct Context *ctx)
   }
 
   time(&nserv->check_time);
-  ctx->data = nntp_data;
+  ctx->mailbox->data = nntp_data;
   if (!nntp_data->bcache && (nntp_data->newsrc_ent || nntp_data->subscribed || SaveUnsubscribed))
     nntp_data->bcache = mutt_bcache_open(&nserv->conn->account, nntp_data->group);
 
@@ -1643,7 +1643,7 @@ static int nntp_mbox_open(struct Context *ctx)
  */
 static int nntp_msg_open(struct Context *ctx, struct Message *msg, int msgno)
 {
-  struct NntpData *nntp_data = ctx->data;
+  struct NntpData *nntp_data = ctx->mailbox->data;
   struct Header *hdr = ctx->hdrs[msgno];
   char article[16];
 
@@ -1785,7 +1785,7 @@ int nntp_post(const char *msg)
   char buf[LONG_STRING];
 
   if (Context && Context->mailbox->magic == MUTT_NNTP)
-    nntp_data = Context->data;
+    nntp_data = Context->mailbox->data;
   else
   {
     CurrentNewsSrv = nntp_select_server(NewsServer, false);
@@ -1911,7 +1911,7 @@ static int nntp_group_poll(struct NntpData *nntp_data, int update_stat)
  */
 static int check_mailbox(struct Context *ctx)
 {
-  struct NntpData *nntp_data = ctx->data;
+  struct NntpData *nntp_data = ctx->mailbox->data;
   struct NntpServer *nserv = nntp_data->nserv;
   time_t now = time(NULL);
   int rc, ret = 0;
@@ -2133,7 +2133,7 @@ static int nntp_mbox_check(struct Context *ctx, int *index_hint)
   int ret = check_mailbox(ctx);
   if (ret == 0)
   {
-    struct NntpData *nntp_data = ctx->data;
+    struct NntpData *nntp_data = ctx->mailbox->data;
     struct NntpServer *nserv = nntp_data->nserv;
     nntp_newsrc_close(nserv);
   }
@@ -2147,7 +2147,7 @@ static int nntp_mbox_check(struct Context *ctx, int *index_hint)
  */
 static int nntp_mbox_sync(struct Context *ctx, int *index_hint)
 {
-  struct NntpData *nntp_data = ctx->data;
+  struct NntpData *nntp_data = ctx->mailbox->data;
   int rc;
 #ifdef USE_HCACHE
   header_cache_t *hc = NULL;
@@ -2208,7 +2208,7 @@ static int nntp_mbox_sync(struct Context *ctx, int *index_hint)
  */
 static int nntp_mbox_close(struct Context *ctx)
 {
-  struct NntpData *nntp_data = ctx->data, *nntp_tmp = NULL;
+  struct NntpData *nntp_data = ctx->mailbox->data, *nntp_tmp = NULL;
 
   if (!nntp_data)
     return 0;
@@ -2371,7 +2371,7 @@ int nntp_check_new_groups(struct NntpServer *nserv)
     if (Context && Context->mailbox->magic == MUTT_NNTP)
     {
       buf[0] = '\0';
-      if (nntp_query(Context->data, buf, sizeof(buf)) < 0)
+      if (nntp_query(Context->mailbox->data, buf, sizeof(buf)) < 0)
         return -1;
     }
   }
@@ -2384,7 +2384,7 @@ int nntp_check_new_groups(struct NntpServer *nserv)
     return -1;
   nntp_data.nserv = nserv;
   if (Context && Context->mailbox->magic == MUTT_NNTP)
-    nntp_data.group = ((struct NntpData *) Context->data)->group;
+    nntp_data.group = ((struct NntpData *) Context->mailbox->data)->group;
   else
     nntp_data.group = NULL;
   i = nserv->groups_num;
@@ -2451,7 +2451,7 @@ int nntp_check_new_groups(struct NntpServer *nserv)
  */
 int nntp_check_msgid(struct Context *ctx, const char *msgid)
 {
-  struct NntpData *nntp_data = ctx->data;
+  struct NntpData *nntp_data = ctx->mailbox->data;
   char buf[LONG_STRING];
 
   FILE *fp = mutt_file_mkstemp();
@@ -2553,7 +2553,7 @@ static int fetch_children(char *line, void *data)
  */
 int nntp_check_children(struct Context *ctx, const char *msgid)
 {
-  struct NntpData *nntp_data = ctx->data;
+  struct NntpData *nntp_data = ctx->mailbox->data;
   struct ChildCtx cc;
   char buf[STRING];
   int rc;

diff --git a/notmuch/mutt_notmuch.c b/notmuch/mutt_notmuch.c
index fb4d452e1bb5ca0ca717f11cf37589e2efea5d4b..2275f3fc3cfa62705e73758f33b4fe4a93635183 100644 (file)
--- a/notmuch/mutt_notmuch.c
+++ b/notmuch/mutt_notmuch.c
@@ -240,11 +240,11 @@ static int init_context(struct Context *ctx)
   if (!ctx || (ctx->mailbox->magic != MUTT_NOTMUCH))
     return -1;
 
-  if (ctx->data)
+  if (ctx->mailbox->data)
     return 0;
 
-  ctx->data = new_ctxdata(ctx->mailbox->path);
-  if (!ctx->data)
+  ctx->mailbox->data = new_ctxdata(ctx->mailbox->path);
+  if (!ctx->mailbox->data)
     return -1;
 
   return 0;
@@ -283,7 +283,7 @@ static char *header_get_fullpath(struct Header *h, char *buf, size_t buflen)
 static struct NmCtxData *get_ctxdata(struct Context *ctx)
 {
   if (ctx && (ctx->mailbox->magic == MUTT_NOTMUCH))
-    return ctx->data;
+    return ctx->mailbox->data;
 
   return NULL;
 }
@@ -1977,7 +1977,7 @@ bool nm_normalize_uri(const char *uri, char *buf, size_t buflen)
     return false;
 
   tmp_ctx.mailbox->magic = MUTT_NOTMUCH;
-  tmp_ctx.data = tmp_ctxdata;
+  tmp_ctx.mailbox->data = tmp_ctxdata;
 
   mutt_debug(2, "#1 () -> db_query: %s\n", tmp_ctxdata->db_query);
 
@@ -2509,8 +2509,8 @@ static int nm_mbox_close(struct Context *ctx)
     }
   }
 
-  free_ctxdata(ctx->data);
-  ctx->data = NULL;
+  free_ctxdata(ctx->mailbox->data);
+  ctx->mailbox->data = NULL;
   return 0;
 }
 

diff --git a/pager.c b/pager.c
index fc042c25aee80326c7fb7f0def9f746eac4487e0..335b9523197631c67304ca2d95ce6229f6f9bbe8 100644 (file)
--- a/pager.c
+++ b/pager.c
@@ -3086,7 +3086,7 @@ int mutt_pager(const char *banner, const char *fname, int flags, struct Pager *e
         CHECK_MODE(IsHeader(extra) && !IsAttach(extra));
         CHECK_ATTACH;
         if (extra->ctx && extra->ctx->mailbox->magic == MUTT_NNTP &&
-            !((struct NntpData *) extra->ctx->data)->allowed && query_quadoption(PostModerated, _("Posting to this group not allowed, may be moderated. Continue?")) != MUTT_YES)
+            !((struct NntpData *) extra->ctx->mailbox->data)->allowed && query_quadoption(PostModerated, _("Posting to this group not allowed, may be moderated. Continue?")) != MUTT_YES)
         {
           break;
         }
@@ -3098,7 +3098,7 @@ int mutt_pager(const char *banner, const char *fname, int flags, struct Pager *e
         CHECK_MODE(IsHeader(extra) || IsMsgAttach(extra));
         CHECK_ATTACH;
         if (extra->ctx && extra->ctx->mailbox->magic == MUTT_NNTP &&
-            !((struct NntpData *) extra->ctx->data)->allowed && query_quadoption(PostModerated, _("Posting to this group not allowed, may be moderated. Continue?")) != MUTT_YES)
+            !((struct NntpData *) extra->ctx->mailbox->data)->allowed && query_quadoption(PostModerated, _("Posting to this group not allowed, may be moderated. Continue?")) != MUTT_YES)
         {
           break;
         }
@@ -3124,7 +3124,7 @@ int mutt_pager(const char *banner, const char *fname, int flags, struct Pager *e
                              _("Reply by mail as poster prefers?")) != MUTT_YES)
         {
           if (extra->ctx && extra->ctx->mailbox->magic == MUTT_NNTP &&
-              !((struct NntpData *) extra->ctx->data)->allowed && query_quadoption(PostModerated, _("Posting to this group not allowed, may be moderated. Continue?")) != MUTT_YES)
+              !((struct NntpData *) extra->ctx->mailbox->data)->allowed && query_quadoption(PostModerated, _("Posting to this group not allowed, may be moderated. Continue?")) != MUTT_YES)
           {
             break;
           }

diff --git a/pop/pop.c b/pop/pop.c
index 34a3cea6b04d947af95f88ff31586997e2f5d5ad..4c4be1c726ad69f0c037a199ae66a082ac6841a5 100644 (file)
--- a/pop/pop.c
+++ b/pop/pop.c
@@ -203,7 +203,7 @@ static int fetch_uidl(char *line, void *data)
 {
   int i, index;
   struct Context *ctx = data;
-  struct PopData *pop_data = ctx->data;
+  struct PopData *pop_data = ctx->mailbox->data;
   char *endp = NULL;
 
   errno = 0;
@@ -250,7 +250,7 @@ static int msg_cache_check(const char *id, struct BodyCache *bcache, void *data)
   struct Context *ctx = data;
   if (!ctx)
     return -1;
-  struct PopData *pop_data = ctx->data;
+  struct PopData *pop_data = ctx->mailbox->data;
   if (!pop_data)
     return -1;
 
@@ -313,7 +313,7 @@ static header_cache_t *pop_hcache_open(struct PopData *pop_data, const char *pat
  */
 static int pop_fetch_headers(struct Context *ctx)
 {
-  struct PopData *pop_data = ctx->data;
+  struct PopData *pop_data = ctx->mailbox->data;
   struct Progress progress;
 
 #ifdef USE_HCACHE
@@ -507,7 +507,7 @@ static int pop_mbox_open(struct Context *ctx)
 
   pop_data = mutt_mem_calloc(1, sizeof(struct PopData));
   pop_data->conn = conn;
-  ctx->data = pop_data;
+  ctx->mailbox->data = pop_data;
 
   if (pop_open_connection(pop_data) < 0)
     return -1;
@@ -575,7 +575,7 @@ static void pop_clear_cache(struct PopData *pop_data)
  */
 static int pop_mbox_close(struct Context *ctx)
 {
-  struct PopData *pop_data = ctx->data;
+  struct PopData *pop_data = ctx->mailbox->data;
 
   if (!pop_data)
     return 0;
@@ -612,7 +612,7 @@ static int pop_msg_open(struct Context *ctx, struct Message *msg, int msgno)
   char buf[LONG_STRING];
   char path[PATH_MAX];
   struct Progress progressbar;
-  struct PopData *pop_data = ctx->data;
+  struct PopData *pop_data = ctx->mailbox->data;
   struct PopCache *cache = NULL;
   struct Header *h = ctx->hdrs[msgno];
   unsigned short bcache = 1;
@@ -772,7 +772,7 @@ static int pop_mbox_sync(struct Context *ctx, int *index_hint)
 {
   int i, j, ret = 0;
   char buf[LONG_STRING];
-  struct PopData *pop_data = ctx->data;
+  struct PopData *pop_data = ctx->mailbox->data;
   struct Progress progress;
 #ifdef USE_HCACHE
   header_cache_t *hc = NULL;
@@ -855,7 +855,7 @@ static int pop_mbox_sync(struct Context *ctx, int *index_hint)
 static int pop_mbox_check(struct Context *ctx, int *index_hint)
 {
   int ret;
-  struct PopData *pop_data = ctx->data;
+  struct PopData *pop_data = ctx->mailbox->data;
 
   if ((pop_data->check_time + PopCheckinterval) > time(NULL))
     return 0;

diff --git a/pop/pop_lib.c b/pop/pop_lib.c
index c355d2b0ba57077fad55a02c40239324cfd8c659..29976d7943293ae3803665f9932a210f926ae54a 100644 (file)
--- a/pop/pop_lib.c
+++ b/pop/pop_lib.c
@@ -421,7 +421,7 @@ err_conn:
  */
 void pop_logout(struct Context *ctx)
 {
-  struct PopData *pop_data = ctx->data;
+  struct PopData *pop_data = ctx->mailbox->data;
 
   if (pop_data->status == POP_CONNECTED)
   {
@@ -607,7 +607,7 @@ static int check_uidl(char *line, void *data)
  */
 int pop_reconnect(struct Context *ctx)
 {
-  struct PopData *pop_data = ctx->data;
+  struct PopData *pop_data = ctx->mailbox->data;
 
   if (pop_data->status == POP_CONNECTED)
     return 0;

diff --git a/send.c b/send.c
index 6da63eaa0566428d491c52ea19c4aae4e7f082c1..55dac6629c03b7e05c6e78c8ac3b2192247d73eb 100644 (file)
--- a/send.c
+++ b/send.c
@@ -1729,7 +1729,8 @@ int ci_send_message(int flags, struct Header *msg, char *tempfile,
 #ifdef USE_NNTP
     if ((flags & SEND_NEWS) && ctx && ctx->mailbox->magic == MUTT_NNTP &&
         !msg->env->newsgroups)
-      msg->env->newsgroups = mutt_str_strdup(((struct NntpData *) ctx->data)->group);
+      msg->env->newsgroups =
+          mutt_str_strdup(((struct NntpData *) ctx->mailbox->data)->group);
 #endif
 
     if (!(flags & (SEND_MAILX | SEND_BATCH)) && !(Autoedit && EditHeaders) &&