factor out Context from mutt_newsgroup_catchup()

diff --git a/browser.c b/browser.c
index 1951bd868a40fdca50d6253abac5a58c43d5984c..af788840fee68220ed6142c60cfce4ba253df77f 100644 (file)
--- a/browser.c
+++ b/browser.c
@@ -2050,7 +2050,7 @@ void mutt_select_file(char *file, size_t filelen, int flags, char ***files, int
             break;
 
           if (i == OP_CATCHUP)
-            mdata = mutt_newsgroup_catchup(Context, CurrentNewsSrv, ff->name);
+            mdata = mutt_newsgroup_catchup(Context->mailbox, CurrentNewsSrv, ff->name);
           else
             mdata = mutt_newsgroup_uncatchup(Context, CurrentNewsSrv, ff->name);
 

diff --git a/index.c b/index.c
index 77248feb782a3fc50f0fde399458921f39260995..1c1e089a9e93e2eab02c272740bfd7d3a3056e1f 100644 (file)
--- a/index.c
+++ b/index.c
@@ -2997,7 +2997,7 @@ int mutt_index_menu(void)
         if (Context && Context->mailbox->magic == MUTT_NNTP)
         {
           struct NntpMboxData *mdata = Context->mailbox->mdata;
-          if (mutt_newsgroup_catchup(Context, mdata->adata, mdata->group))
+          if (mutt_newsgroup_catchup(Context->mailbox, mdata->adata, mdata->group))
             menu->redraw = REDRAW_INDEX | REDRAW_STATUS;
         }
         break;

diff --git a/mx.c b/mx.c
index 113ce66634ee71e7242e7ecc922ceb05170340b5..57aa14e495edc4913d11c2384d98614dfa5a3d65 100644 (file)
--- a/mx.c
+++ b/mx.c
@@ -590,7 +590,7 @@ int mx_mbox_close(struct Context **pctx, int *index_hint)
       if (rc == MUTT_ABORT)
         return -1;
       else if (rc == MUTT_YES)
-        mutt_newsgroup_catchup(Context, mdata->adata, mdata->group);
+        mutt_newsgroup_catchup(Context->mailbox, mdata->adata, mdata->group);
     }
   }
 #endif

diff --git a/nntp/newsrc.c b/nntp/newsrc.c
index 7ae605eaae1cddb5b590a5538625a40f07791a8c..6bea251cc71f6535446eb981001fb5b3da5f26f1 100644 (file)
--- a/nntp/newsrc.c
+++ b/nntp/newsrc.c
@@ -1277,13 +1277,13 @@ struct NntpMboxData *mutt_newsgroup_unsubscribe(struct NntpAccountData *adata, c
 
 /**
  * mutt_newsgroup_catchup - Catchup newsgroup
- * @param ctx   Mailbox
+ * @param m     Mailbox
  * @param adata NNTP server
  * @param group Newsgroup
  * @retval ptr  NNTP data
  * @retval NULL Error
  */
-struct NntpMboxData *mutt_newsgroup_catchup(struct Context *ctx,
+struct NntpMboxData *mutt_newsgroup_catchup(struct Mailbox *m,
                                             struct NntpAccountData *adata, char *group)
 {
   struct NntpMboxData *mdata = NULL;
@@ -1303,7 +1303,6 @@ struct NntpMboxData *mutt_newsgroup_catchup(struct Context *ctx,
     mdata->newsrc_ent[0].last = mdata->last_message;
   }
   mdata->unread = 0;
-  struct Mailbox *m = ctx ? ctx->mailbox : NULL;
   if (m && (m->mdata == mdata))
   {
     for (unsigned int i = 0; i < m->msg_count; i++)

diff --git a/nntp/nntp.h b/nntp/nntp.h
index 5f6b74d6f742adda5767c5f2e56bb4768d8e16ba..f6b92a40f5d7ebc1e897064baec0f8835859a0a1 100644 (file)
--- a/nntp/nntp.h
+++ b/nntp/nntp.h
@@ -153,7 +153,7 @@ struct NntpMboxData
 struct NntpAccountData *nntp_select_server(struct Mailbox *m, char *server, bool leave_lock);
 struct NntpMboxData *mutt_newsgroup_subscribe(struct NntpAccountData *adata, char *group);
 struct NntpMboxData *mutt_newsgroup_unsubscribe(struct NntpAccountData *adata, char *group);
-struct NntpMboxData *mutt_newsgroup_catchup(struct Context *ctx, struct NntpAccountData *adata, char *group);
+struct NntpMboxData *mutt_newsgroup_catchup(struct Mailbox *m, struct NntpAccountData *adata, char *group);
 struct NntpMboxData *mutt_newsgroup_uncatchup(struct Context *ctx, struct NntpAccountData *adata, char *group);
 int nntp_active_fetch(struct NntpAccountData *adata, bool new);
 int nntp_newsrc_update(struct NntpAccountData *adata);