Changeset 1111:53998cee3e2d for complete.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:

• complete.c (modified) (4 diffs)

complete.c

@@ -18 +18 @@
 
 #include "mutt.h"
+#ifdef USE_IMAP
+#include "mailbox.h"
+#include "imap.h"
+#endif
 
 #include <dirent.h>
@@ -39 +43 @@
   char dirpart[_POSIX_PATH_MAX], exp_dirpart[_POSIX_PATH_MAX];
   char filepart[_POSIX_PATH_MAX];
+#ifdef USE_IMAP
+  char imap_path[LONG_STRING];
+
+  dprint (2, (debugfile, "mutt_complete: completing %s\n", s));
+
+  /* we can use '/' as a delimiter, imap_complete rewrites it */
+  if (*s == '=' || *s == '+')
+  {
+    if (s[1])
+      snprintf (imap_path, sizeof(imap_path), "%s/%s", NONULL(Maildir),
+                s+1);
+    else
+      strfcpy (imap_path, NONULL(Maildir), sizeof(imap_path));
+  }
+  else
+  {
+    strfcpy (imap_path, s, sizeof(imap_path));
+  }
+
+  if (mx_is_imap (imap_path))
+  {
+    return imap_complete (s, imap_path);
+  }
+#endif
   
   if (*s == '=' || *s == '+')
@@ -86 +114 @@
       dirpart[0] = 0;
       strfcpy (filepart, s, sizeof (filepart));
-#ifdef USE_IMAP
-      if (s[0] != '{')
-#endif
-        dirp = opendir (".");
+      dirp = opendir (".");
     }
   }
@@ -95 +120 @@
   if (dirp == NULL)
   {
-#ifdef USE_IMAP
-    /* If we are trying to complete an IMAP folder, it will start with {
-     * in which case, we just return 0 at this point.  Eventually, we
-     * might complete the actually folder name from the server
-     */
-    if ((s[0] == '{') || (exp_dirpart[0] == '{'))
-      return 0;
-#endif
     dprint (1, (debugfile, "mutt_complete(): %s: %s (errno %d).\n", exp_dirpart, strerror (errno), errno));
     return (-1);