Changeset 3495:14ec8eba0341 for compose.c

Timestamp:

2003-10-04 13:34:59 (5 years ago)

Author:

Thomas Roessler <roessler@…>

Branch:

HEAD

Message:

This patch fixes various aspects of the attachment-saving
user interface. Changes include:

* When tagging and saving multiple attachments, you can now use the

same target directory for multiple attachments.

* When you can't save an attachment, you get an opportunity to enter

a new file name.

* The menu cursor will highlight the attachment that you are

currently discussing with mutt.

* Various bug fixes.

This does, in particular, address #1619 (Debian#208430).

Files:

• compose.c (modified) (5 diffs)

compose.c

@@ -484 +484 @@
   if (idxlen)
     idx[idxlen - 1]->content->next = idx[idxlen]->content;
+  idx[idxlen]->content->aptr = idx[idxlen];
   menu->current = idxlen++;
   mutt_update_tree (idx, idxlen);
@@ -761 +762 @@
         if ((idx[idxlen]->content = crypt_pgp_make_key_attachment(NULL)) != NULL)
         {
-          idx[idxlen]->level = (idxlen > 0) ? idx[idxlen-1]->level : 0;
-
-          if(idxlen)
-            idx[idxlen - 1]->content->next = idx[idxlen]->content;
-          
-          menu->current = idxlen++;
-          mutt_update_tree (idx, idxlen);
-          menu->max = idxlen;
+          update_idx (menu, idx, idxlen++);
           menu->redraw |= REDRAW_INDEX;
         }
@@ -1188 +1182 @@
             continue;
           }
-          
-          idx[idxlen]->level = (idxlen > 0) ? idx[idxlen-1]->level : 0;
-          if (idxlen)
-            idx[idxlen - 1]->content->next = idx[idxlen]->content;
-          
-          menu->current = idxlen++;
-          mutt_update_tree (idx, idxlen);
-          menu->max = idxlen;
+          update_idx (menu, idx, idxlen++);
 
           idx[menu->current]->content->type = itype;
@@ -1228 +1215 @@
       case OP_SAVE:
         CHECK_COUNT;
-        mutt_save_attachment_list (NULL, menu->tagprefix, menu->tagprefix ?  msg->content : idx[menu->current]->content, NULL);
+        mutt_save_attachment_list (NULL, menu->tagprefix, menu->tagprefix ?  msg->content : idx[menu->current]->content, NULL, menu);
         MAYBE_REDRAW (menu->redraw);
         break;
@@ -1393 +1380 @@
     msg->content = idx[0]->content;
     for (i = 0; i < idxlen; i++)
+    {
+      idx[i]->content->aptr = NULL;
       FREE (&idx[i]);
+    }
   }
   else