Changeset 1522:cc8ff850aef0 for browser.c

Timestamp:

2000-02-14 08:07:54 (9 years ago)

Author:

Thomas Roessler <roessler@…>

Branch:

HEAD

Message:

Brendan Cully's patch from <20000212185021.A7365@…>.

Files:

• browser.c (modified) (9 diffs)

browser.c

@@ -173 +173 @@
     case 'f':
 #ifdef USE_IMAP
-      if (mx_is_imap (folder->ff->name))
+      if (folder->ff->imap)
         strfcpy (fn, NONULL(folder->ff->desc), sizeof (fn));
       else
@@ -208 +208 @@
       {
 #ifdef USE_IMAP
-        if (mx_is_imap (folder->ff->name))
-        {
+        if (folder->ff->imap)
+        {
+          sprintf (permission, "IMAP %c%c",
+                   folder->ff->inferiors ? '+' : ' ',
+                   folder->ff->selectable ? 'S' : ' ');
           snprintf (tmp, sizeof (tmp), "%%%ss", fmt);
-          snprintf (dest, destlen, tmp, "IMAP");
+          snprintf (dest, destlen, tmp, permission);
         }                                        
 #endif
@@ -329 +332 @@
   (state->entry)[state->entrylen].desc = safe_strdup (name);
 #ifdef USE_IMAP
-  (state->entry)[state->entrylen].notfolder = 0;
-#endif
-
+  (state->entry)[state->entrylen].imap = 0;
+#endif
   (state->entrylen)++;
 }
@@ -422 +424 @@
   {
 #ifdef USE_IMAP
-    if (tmp->path[0] == '{')
+    if (mx_is_imap (tmp->path))
     {
       add_folder (menu, state, tmp->path, NULL, tmp->new);
@@ -624 +626 @@
             link_is_dir (LastDir, state.entry[menu->current].name)) 
 #ifdef USE_IMAP
-            || state.entry[menu->current].notfolder
+            || state.entry[menu->current].inferiors
 #endif
             )
@@ -646 +648 @@
           if ((mx_get_magic (buf) <= 0)
 #ifdef USE_IMAP
-            || state.entry[menu->current].notfolder
+            || state.entry[menu->current].inferiors
 #endif
             )
@@ -682 +684 @@
             else if (state.imap_browse)
             {
+              int n;
+              
               strfcpy (LastDir, state.entry[menu->current].name,
                 sizeof (LastDir));
+              /* tack on delimiter here */
+              if ((state.entry[menu->current].delim != '\0') &&
+                  (n = strlen (LastDir)+1) < sizeof (LastDir))
+              {
+                LastDir[n] = '\0';
+                LastDir[n-1] = state.entry[menu->current].delim;
+              }
             }
 #endif
@@ -807 +818 @@
 
       case OP_DELETE_MAILBOX:
-        if (!mx_is_imap (state.entry[menu->current].name))
+        if (!state.entry[menu->current].imap)
           mutt_error (_("Delete is only supported for IMAP mailboxes"));
         else
@@ -1059 +1070 @@
         }
 
+#ifdef USE_IMAP
+        if (state.entry[menu->current].selectable)
+        {
+          strfcpy (f, state.entry[menu->current].name, flen);
+          destroy_state (&state);
+          mutt_menuDestroy (&menu);
+          return;
+        }
+        else
+#endif
         if (S_ISDIR (state.entry[menu->current].mode) ||
             (S_ISLNK (state.entry[menu->current].mode) &&