Changeset 1550:f7bb60fdba1b for browser.c

Timestamp:

2000-02-22 08:53:44 (9 years ago)

Author:

Thomas Roessler <roessler@…>

Branch:

HEAD

Message:

Brendan Cully's latest IMAP browser fixes.

Files:

• browser.c (modified) (2 diffs)

browser.c

@@ -210 +210 @@
         if (folder->ff->imap)
         {
-          sprintf (permission, "IMAP %c%c",
-                   folder->ff->inferiors ? '+' : ' ',
-                   folder->ff->selectable ? 'S' : ' ');
+          /* mark folders with subfolders AND mail */
+          sprintf (permission, "IMAP %c",
+            (folder->ff->inferiors && folder->ff->selectable) ? '+' : ' ');
           snprintf (tmp, sizeof (tmp), "%%%ss", fmt);
           snprintf (dest, destlen, tmp, permission);
@@ -689 +689 @@
                 sizeof (LastDir));
               /* tack on delimiter here */
-              if ((state.entry[menu->current].delim != '\0') &&
-                  (n = strlen (LastDir)+1) < sizeof (LastDir))
+              n = strlen (LastDir)+1;
+              
+              /* special case "" needs no delimiter */
+              if ((strlen (strchr (LastDir, '}')) > 0) &&
+                  (state.entry[menu->current].delim != '\0') &&
+                  (n < sizeof (LastDir)))
               {
                 LastDir[n] = '\0';