From: Richard Russon <rich@flatcap.org>
Date: Thu, 18 Jul 2019 16:23:17 +0000 (+0100)
Subject: nntp: remove old Context references
X-Git-Tag: 2019-10-25~122
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d2331b4516b7767cb134eea349090fead867c192;p=neomutt

nntp: remove old Context references
---

diff --git a/nntp/browse.c b/nntp/browse.c
index 2bd0351d7..e4979beb9 100644
--- a/nntp/browse.c
+++ b/nntp/browse.c
@@ -30,11 +30,8 @@
 #include <stdio.h>
 #include "mutt/mutt.h"
 #include "email/lib.h"
-#include "core/lib.h"
 #include "browser.h"
-#include "context.h"
 #include "format_flags.h"
-#include "globals.h"
 #include "muttlib.h"
 #include "nntp.h"
 
@@ -108,12 +105,7 @@ const char *group_index_format_str(char *buf, size_t buflen, size_t col, int col
       break;
 
     case 'n':
-      if (Context && (Context->mailbox->mdata == folder->ff->nd))
-      {
-        snprintf(fmt, sizeof(fmt), "%%%sd", prec);
-        snprintf(buf, buflen, fmt, Context->mailbox->msg_new);
-      }
-      else if (C_MarkOld && (folder->ff->nd->last_cached >= folder->ff->nd->first_message) &&
+      if (C_MarkOld && (folder->ff->nd->last_cached >= folder->ff->nd->first_message) &&
                (folder->ff->nd->last_cached <= folder->ff->nd->last_message))
       {
         snprintf(fmt, sizeof(fmt), "%%%sd", prec);
@@ -140,11 +132,6 @@ const char *group_index_format_str(char *buf, size_t buflen, size_t col, int col
                               group_index_format_str, data, flags);
         }
       }
-      else if (Context && (Context->mailbox->mdata == folder->ff->nd))
-      {
-        snprintf(fmt, sizeof(fmt), "%%%sd", prec);
-        snprintf(buf, buflen, fmt, Context->mailbox->msg_unread);
-      }
       else
       {
         snprintf(fmt, sizeof(fmt), "%%%sd", prec);
diff --git a/nntp/nntp.c b/nntp/nntp.c
index 4bb29ef17..5f8688ce4 100644
--- a/nntp/nntp.c
+++ b/nntp/nntp.c
@@ -45,7 +45,6 @@
 #include "mutt.h"
 #include "nntp.h"
 #include "bcache.h"
-#include "context.h"
 #include "curs_lib.h"
 #include "globals.h"
 #include "hcache/hcache.h"
@@ -2139,13 +2138,6 @@ int nntp_check_new_groups(struct Mailbox *m, struct NntpAccountData *adata)
           update_active = true;
       }
     }
-    /* select current newsgroup */
-    if (Context && (Context->mailbox->magic == MUTT_NNTP))
-    {
-      buf[0] = '\0';
-      if (nntp_query(Context->mailbox->mdata, buf, sizeof(buf)) < 0)
-        return -1;
-    }
   }
   else if (adata->newgroups_time)
     return 0;
@@ -2155,8 +2147,8 @@ int nntp_check_new_groups(struct Mailbox *m, struct NntpAccountData *adata)
   if (nntp_date(adata, &now) < 0)
     return -1;
   tmp_mdata.adata = adata;
-  if (Context && (Context->mailbox->magic == MUTT_NNTP))
-    tmp_mdata.group = ((struct NntpMboxData *) Context->mailbox->mdata)->group;
+  if (m && m->mdata)
+    tmp_mdata.group = ((struct NntpMboxData *) m->mdata)->group;
   else
     tmp_mdata.group = NULL;
   i = adata->groups_num;