Changeset 1111:53998cee3e2d for buffy.c

Timestamp:

1999-07-20 01:05:32 (9 years ago)

Author:

Thomas Roessler <roessler@…>

Branch:

HEAD

Message:

Bugs fixed
* Mutt sometimes forgets that IMAP folders with new mail have new

mail.

* On some common IMAP servers, Mutt erroneously insists that the

current folder has new mail.

* Mutt constantly polls the server for new messages,

disregarding the imap_checkinterval option.

New features
* tab-completion of IMAP folders. Not yet namespace aware, though it

will work within an alternate namespace (eg won't complete #ft ->
#ftp, but will complete #ftp/pu -> #ftp/pub). Some tweaking of the
browser was necessary to get it to cooperate with completion.
Some remains to be done.

(From: From: Brendan Cully <brendan@…>)

Files:

• buffy.c (modified) (6 diffs)

buffy.c

@@ -229 +229 @@
   struct stat contex_sb;
   time_t t;
+#ifdef USE_IMAP
+  static time_t last_imap_check = 0;
+  int do_imap_check = 1;
+
+  if (ImapCheckTime)
+  {
+    time_t now = time (NULL);
+    if (!force && (now - last_imap_check < ImapCheckTime))
+      do_imap_check = 0;
+    else
+      last_imap_check = now;
+  }
+#endif
 
   /* fastest return if there are no mailboxes */
@@ -234 +247 @@
     return 0;
   t = time (NULL);
-  if (!force && t - BuffyTime < BuffyTimeout)
+  if (!force && (t - BuffyTime < BuffyTimeout))
     return BuffyCount;
  
@@ -241 +254 @@
   BuffyNotify = 0;
 
+#ifdef USE_IMAP
+  if (!Context || Context->magic != M_IMAP)
+#endif
   /* check device ID and serial number instead of comparing paths */
   if (!Context || !Context->path || stat (Context->path, &contex_sb) != 0)
@@ -250 +266 @@
   for (tmp = Incoming; tmp; tmp = tmp->next)
   {
-    tmp->new = 0;
-
 #ifdef USE_IMAP
     if ((tmp->magic == M_IMAP) || mx_is_imap (tmp->path))
-    {
       tmp->magic = M_IMAP;
-    }
     else
 #endif
-    if (stat (tmp->path, &sb) != 0 || sb.st_size == 0 ||
-        (!tmp->magic && (tmp->magic = mx_get_magic (tmp->path)) <= 0))
-    {
-      /* if the mailbox still doesn't exist, set the newly created flag to
-       * be ready for when it does.
-       */
-      tmp->newly_created = 1;
-      tmp->magic = 0;
-#ifdef BUFFY_SIZE
-      tmp->size = 0;
-#endif
-      continue;
-    }
-
+    {
+      tmp->new = 0;
+      
+      if (stat (tmp->path, &sb) != 0 || sb.st_size == 0 ||
+          (!tmp->magic && (tmp->magic = mx_get_magic (tmp->path)) <= 0))
+      {
+        /* if the mailbox still doesn't exist, set the newly created flag to
+         * be ready for when it does.
+         */
+        tmp->newly_created = 1;
+        tmp->magic = 0;
+#ifdef BUFFY_SIZE
+        tmp->size = 0;
+#endif
+        continue;
+      }
+
+#ifdef USE_IMAP
+    }
+#endif
+
+    /* check to see if the folder is the currently selected folder
+     * before polling */
     if (!Context || !Context->path || 
+#ifdef USE_IMAP
+        /* unless folder is an IMAP folder */
+        tmp->magic == M_IMAP ||
+#endif
         sb.st_dev != contex_sb.st_dev || sb.st_ino != contex_sb.st_ino)
     {
@@ -327 +352 @@
 #ifdef USE_IMAP
       case M_IMAP:
-        if (imap_buffy_check (tmp->path) > 0)
-        {
-          BuffyCount++;
-          tmp->new = 1;
-        }
+        /* poll on do_imap_check, else return cached value */
+        if (do_imap_check)
+        {
+          tmp->new = 0;
+          if (imap_buffy_check (tmp->path) > 0)
+          {
+            BuffyCount++;
+            tmp->new = 1;
+          }
+        }
+        else
+        {
+          if (tmp->new)
+            BuffyCount++;
+        }
+
         break;
 #endif
@@ -346 +382 @@
       BuffyNotify++;
   }
+
   BuffyDoneTime = BuffyTime;
   return (BuffyCount);