Differentiate between first and second maildir passes in progress indicator

diff --git a/ChangeLog b/ChangeLog
index 72338a1fd4a86c61e9b15a43cf82c87e917cba2c..ecb81c4cc2f09c5635c6260b6ee6dfbf87384735 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,10 @@
-2007-04-12 11:54 -0700  Brendan Cully  <brendan@kublai.com>  (3ee4effbb8e8)
+2007-04-12 17:55 -0700  Brendan Cully  <brendan@kublai.com>  (73894f3f1943)
+
+       * mh.c: Only call mutt_set_flag when necessary when checking for
+       maildir changes (fixes #1216)
+
+       * flags.c: Only update header color in mutt_set_flag if flag has
+       changed (see #1216, #1931)
 
        * init.h: Make $header_cache_compress default to set
 

diff --git a/mh.c b/mh.c
index 3d60804b7d54f2877217dd5f136d8ffc769321d3..3d15dc4c4ed547291de77f0ec2e1338c5567a7b9 100644 (file)
--- a/mh.c
+++ b/mh.c
@@ -1072,7 +1072,10 @@ int mh_read_dir (CONTEXT * ctx, const char *subdir)
   progress_t progress;
 
   memset (&mhs, 0, sizeof (mhs));
-  snprintf (msgbuf, sizeof (msgbuf), _("Reading %s..."), ctx->path);
+  if (ctx->magic == M_MAILDIR)
+    snprintf (msgbuf, sizeof (msgbuf), _("Scanning %s..."), ctx->path);
+  else
+    snprintf (msgbuf, sizeof (msgbuf), _("Reading %s..."), ctx->path);
   mutt_progress_init (&progress, msgbuf, M_PROGRESS_MSG, ReadInc, 0);
 
   if (!ctx->data)
@@ -1102,7 +1105,11 @@ int mh_read_dir (CONTEXT * ctx, const char *subdir)
 #endif /* USE_INODESORT */
 
   if (ctx->magic == M_MAILDIR)
+  {
+    snprintf (msgbuf, sizeof (msgbuf), _("Reading %s..."), ctx->path);
+    mutt_progress_init (&progress, msgbuf, M_PROGRESS_MSG, ReadInc, 0);
     maildir_delayed_parsing (ctx, md, &progress);
+  }
 
   maildir_move_to_context (ctx, &md);