Changeset 2069:ca45605ed6eb for browser.c

Timestamp:

2000-08-21 08:42:19 (8 years ago)

Author:

Thomas Roessler <roessler@…>

Branch:

HEAD

Message:

patch-bac.createplus-1

Files:

• browser.c (modified) (6 diffs)

browser.c

@@ -203 +203 @@
         snprintf (dest, destlen, tmp, permission);
       }
+#ifdef USE_IMAP
+      else if (folder->ff->imap)
+      {
+        /* 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);
+      }                                        
+#endif
       else
       {
-#ifdef USE_IMAP
-        if (folder->ff->imap)
-        {
-          /* 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);
-        }                                        
-#endif
+        snprintf (tmp, sizeof (tmp), "%%%ss", fmt);
+        snprintf (dest, destlen, tmp, "");
       }
       break;
@@ -253 +255 @@
       
     case 'N':
+#ifdef USE_IMAP
+      if (mx_is_imap (folder->ff->desc))
+      {
+        snprintf (tmp, sizeof (tmp), "%%%sd", fmt);
+        snprintf (dest, destlen, tmp, folder->ff->new);
+        break;
+      }
+#endif
       snprintf (tmp, sizeof (tmp), "%%%sc", fmt);
-      snprintf (dest, destlen, tmp, folder->ff->is_new ? 'N' : ' ');
+      snprintf (dest, destlen, tmp, folder->ff->new ? 'N' : ' ');
       break;
       
@@ -328 +338 @@
   }
 
-  (state->entry)[state->entrylen].is_new = new;
+  (state->entry)[state->entrylen].new = new;
   (state->entry)[state->entrylen].name = safe_strdup (name);
   (state->entry)[state->entrylen].desc = safe_strdup (name);
@@ -816 +826 @@
         break;
 
-      case OP_NEW_MAILBOX:
-        mutt_error (_("Creating mailboxes is not yet supported."));
+      case OP_CREATE_MAILBOX:
+        if (!state.imap_browse)
+          mutt_error (_("Create is only supported for IMAP mailboxes"));
+        else
+        {
+          imap_mailbox_create (LastDir);
+          /* TODO: find a way to detect if the new folder would appear in
+           *   this window, and insert it without starting over. */
+          destroy_state (&state);
+          init_state (&state, NULL);
+          state.imap_browse = 1;
+          imap_browse (LastDir, &state);
+          menu->data = state.entry;
+          menu->current = 0; 
+          menu->top = 0; 
+          init_menu (&state, menu, title, sizeof (title), buffy);
+          MAYBE_REDRAW (menu->redraw);
+        }
         break;
 
@@ -825 +851 @@
         else
         {
-          char msg[LONG_STRING];
+          char msg[SHORT_STRING];
           IMAP_MBOX mx;
           int nentry = menu->current;
@@ -851 +877 @@
           else
             mutt_message _("Mailbox not deleted.");
+          FREE (&mx.mbox);
         }
         break;