notmuch: use mbox_check_stats()

diff --git a/mailbox.c b/mailbox.c
index d37510121612a19a5b06b22d45c8fcccafa76838..64668861ba0c20fbaa1d2acd819fb8d2cb3c30e7 100644 (file)
--- a/mailbox.c
+++ b/mailbox.c
@@ -180,25 +180,13 @@ static void mailbox_check(struct Mailbox *m, struct stat *ctx_sb, bool check_sta
         if (mh_mailbox(m, check_stats))
           MailboxCount++;
         break;
-#ifdef USE_NOTMUCH
-      case MUTT_NOTMUCH:
-        m->msg_count = 0;
-        m->msg_unread = 0;
-        m->msg_flagged = 0;
-        nm_nonctx_get_count(m);
-        if (m->msg_unread > 0)
-        {
-          MailboxCount++;
-          m->has_new = true;
-        }
-        break;
-#endif
       case MUTT_IMAP:
         if (!m->has_new)
           break;
         /* fallthrough */
       case MUTT_MBOX:
       case MUTT_MMDF:
+      case MUTT_NOTMUCH:
         if (mx_mbox_check_stats(m, 0))
           MailboxCount++;
         break;

diff --git a/notmuch/mutt_notmuch.c b/notmuch/mutt_notmuch.c
index 253c8d7ac89ee135fefed33cb51ab32145c2962c..bd498c63cbd117e0bb8f9c9a37798ca32af24197 100644 (file)
--- a/notmuch/mutt_notmuch.c
+++ b/notmuch/mutt_notmuch.c
@@ -1859,12 +1859,9 @@ int nm_update_filename(struct Mailbox *m, const char *old, const char *new, stru
 }
 
 /**
- * nm_nonctx_get_count - Perform some queries without an open database
- * @param m Mailbox to examine
- * @retval  0 Success
- * @retval -1 Failure
+ * nm_mbox_check_stats - Implements MxOps::check_stats()
  */
-int nm_nonctx_get_count(struct Mailbox *m)
+static int nm_mbox_check_stats(struct Mailbox *m, int flags)
 {
   struct UrlQueryString *item = NULL;
   struct Url *url = NULL;
@@ -2557,6 +2554,7 @@ struct MxOps mx_notmuch_ops = {
   .mbox_open        = nm_mbox_open,
   .mbox_open_append = NULL,
   .mbox_check       = nm_mbox_check,
+  .mbox_check_stats = nm_mbox_check_stats,
   .mbox_sync        = nm_mbox_sync,
   .mbox_close       = nm_mbox_close,
   .msg_open         = nm_msg_open,

diff --git a/notmuch/mutt_notmuch.h b/notmuch/mutt_notmuch.h
index b59ff8579fd8bb1bfac676522ddf1707691e541c..6eb27f0a2715bf30ebab5e50f5646335dae613d9 100644 (file)
--- a/notmuch/mutt_notmuch.h
+++ b/notmuch/mutt_notmuch.h
@@ -63,7 +63,6 @@ char *nm_email_get_folder        (struct Email *e);
 void  nm_db_longrun_done            (struct Mailbox *m);
 void  nm_db_longrun_init            (struct Mailbox *m, bool writable);
 bool  nm_message_is_still_queried(struct Mailbox *m, struct Email *e);
-int   nm_nonctx_get_count        (struct Mailbox *m);
 void  nm_parse_type_from_query   (struct NmMboxData *mdata, char *buf);
 int   nm_path_probe              (const char *path, const struct stat *st);
 void  nm_query_window_backward   (void);