X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=buffy.c;h=6b91745a2df957f39f98484edc953527d5a716a2;hp=93a5716fed80c0747645864c878367bcdfc25c02;hb=2709e0121568c93bd012a57dedb15456271ef025;hpb=f404a0ca916be07049af51a3022baaaaab94def6

diff --git a/buffy.c b/buffy.c
index 93a5716..6b91745 100644
--- a/buffy.c
+++ b/buffy.c
@@ -404,6 +404,7 @@ int mutt_buffy_check (int force)
 	}
 	tmp->msgcount = 0;
 	tmp->msg_unread = 0;
+	tmp->msg_flagged = 0;
 	while ((de = readdir (dirp)) != NULL)
 	{
 	  char *p;
@@ -411,14 +412,17 @@ int mutt_buffy_check (int force)
 	      (!(p = strstr (de->d_name, ":2,")) || !strchr (p + 3, 'T')))
 	  {
 	    /* one new and undeleted message is enough */
-	    BuffyCount++;
-	    tmp->has_new = tmp->new = 1;
-        tmp->msgcount++;
-		tmp->msg_unread++;
+            if (tmp->new != 1)
+	    {
+               BuffyCount++;
+	       tmp->has_new = tmp->new = 1;
+	    }
+	    tmp->msgcount++;
+	    tmp->msg_unread++;
 	  }
 	}
 	closedir (dirp);
-#if 0
+#if 1
   /* I commented this out because it led to an infite "New mail in ..." loop,
    * and when looking at the code, the check seems to be overly eager.
    *   -- ak
@@ -437,8 +441,13 @@ int mutt_buffy_check (int force)
 	  {
 	    /* one new and undeleted message is enough */
 	    BuffyCount++;
+#if 0
+            /* we're checking for read and not new mail; 
+             * seems like copy'n'paste error
+             */
 	    tmp->has_new = tmp->new = 1;
-        tmp->msgcount++;
+#endif
+            tmp->msgcount++;
 	  }
 	}
 	closedir (dirp);