Changeset 3783:9af868b4220d for compose.c

Timestamp:

2004-12-07 11:50:04 (4 years ago)

Author:

Thomas Roessler <roessler@…>

Branch:

HEAD

Message:

Add send2-hook and fix alternates handling.

Files:

• compose.c (modified) (27 diffs)

compose.c

@@ -528 +528 @@
       case OP_COMPOSE_EDIT_FROM:
         menu->redraw = edit_address_list (HDR_FROM, &msg->env->from);
+        mutt_message_hook (NULL, msg, M_SEND2HOOK);
         break;
       case OP_COMPOSE_EDIT_TO:
         menu->redraw = edit_address_list (HDR_TO, &msg->env->to);
-        break;
+        mutt_message_hook (NULL, msg, M_SEND2HOOK);
+        break;
       case OP_COMPOSE_EDIT_BCC:
         menu->redraw = edit_address_list (HDR_BCC, &msg->env->bcc);
+        mutt_message_hook (NULL, msg, M_SEND2HOOK);
         break;
       case OP_COMPOSE_EDIT_CC:
         menu->redraw = edit_address_list (HDR_CC, &msg->env->cc);
-        break;
+        mutt_message_hook (NULL, msg, M_SEND2HOOK);     
+        break;
       case OP_COMPOSE_EDIT_SUBJECT:
         if (msg->env->subject)
@@ -551 +555 @@
             mutt_paddstr (W, msg->env->subject);
         }
-        break;
+        mutt_message_hook (NULL, msg, M_SEND2HOOK);
+        break;
       case OP_COMPOSE_EDIT_REPLY_TO:
         menu->redraw = edit_address_list (HDR_REPLYTO, &msg->env->reply_to);
+        mutt_message_hook (NULL, msg, M_SEND2HOOK);
         break;
       case OP_COMPOSE_EDIT_FCC:
@@ -566 +572 @@
         }
         MAYBE_REDRAW (menu->redraw);
-        break;
+        mutt_message_hook (NULL, msg, M_SEND2HOOK);
+        break;
       case OP_COMPOSE_EDIT_MESSAGE:
         if (Editor && (mutt_strcmp ("builtin", Editor) != 0) && !option (OPTEDITHDRS))
@@ -573 +580 @@
           mutt_update_encoding (msg->content);
           menu->redraw = REDRAW_CURRENT | REDRAW_STATUS;
+          mutt_message_hook (NULL, msg, M_SEND2HOOK);
           break;
         }
@@ -612 +620 @@
         }
 
-        menu->redraw = REDRAW_FULL;
+        menu->redraw = REDRAW_FULL;
+        mutt_message_hook (NULL, msg, M_SEND2HOOK);
         break;
 
@@ -643 +652 @@
         }
         
-        break;
+        mutt_message_hook (NULL, msg, M_SEND2HOOK);
+        break;
 
 
@@ -689 +699 @@
           menu->redraw |= REDRAW_INDEX | REDRAW_STATUS;
         }
-        break;
+        mutt_message_hook (NULL, msg, M_SEND2HOOK);
+        break;
 
       case OP_COMPOSE_ATTACH_MESSAGE:
@@ -795 +806 @@
           SortAux = oldSortAux;
         }
-        break;
+        mutt_message_hook (NULL, msg, M_SEND2HOOK);
+        break;
 
       case OP_DELETE:
@@ -814 +826 @@
 
         menu->redraw |= REDRAW_STATUS;
-        break;
+        mutt_message_hook (NULL, msg, M_SEND2HOOK);
+        break;
 
 #define CURRENT idx[menu->current]->content
@@ -832 +845 @@
           mutt_message (_("The current attachment will be converted."));
         menu->redraw = REDRAW_CURRENT;
+        mutt_message_hook (NULL, msg, M_SEND2HOOK);
         break;
       }
@@ -848 +862 @@
           menu->redraw = REDRAW_CURRENT;
         }
-        break;
+        mutt_message_hook (NULL, msg, M_SEND2HOOK);
+        break;
 
       case OP_COMPOSE_UPDATE_ENCODING:
@@ -867 +882 @@
           menu->redraw = REDRAW_CURRENT | REDRAW_STATUS;
         }
+        mutt_message_hook (NULL, msg, M_SEND2HOOK);
         break;
       
@@ -885 +901 @@
           menu->redraw = REDRAW_CURRENT;
         }
-        break;
+        mutt_message_hook (NULL, msg, M_SEND2HOOK);
+        break;
 
       case OP_COMPOSE_EDIT_ENCODING:
@@ -903 +920 @@
             mutt_error _("Invalid encoding.");
         }
-        break;
+        mutt_message_hook (NULL, msg, M_SEND2HOOK);
+        break;
 
       case OP_COMPOSE_SEND_MESSAGE:
+
+        /* Note: We don't invoke send2-hook here, since we want to leave
+         * users an opportunity to change settings from the ":" prompt.
+         */
       
         if(check_attachments(idx, idxlen) != 0)
@@ -937 +959 @@
         mutt_update_encoding (idx[menu->current]->content);
         menu->redraw = REDRAW_CURRENT | REDRAW_STATUS;
+        mutt_message_hook (NULL, msg, M_SEND2HOOK);
         break;
 
@@ -952 +975 @@
 # endif
         menu->redraw = REDRAW_INDEX;
+        /* No send2hook since this doesn't change the message. */
         break;
 
@@ -969 +993 @@
           menu->redraw = REDRAW_CURRENT;
 
+        /* No send2hook since this doesn't change the message. */
         break;
       
@@ -995 +1020 @@
           
         }
-        break;
+        mutt_message_hook (NULL, msg, M_SEND2HOOK);
+        break;
 
       case OP_COMPOSE_NEW_MIME:
@@ -1062 +1088 @@
           }
         }
-        break;
+        mutt_message_hook (NULL, msg, M_SEND2HOOK);    
+        break;
 
       case OP_COMPOSE_EDIT_MIME:
@@ -1071 +1098 @@
           menu->redraw = REDRAW_FULL;
         }
-        break;
+        mutt_message_hook (NULL, msg, M_SEND2HOOK);
+        break;
 
       case OP_VIEW_ATTACH:
@@ -1078 +1106 @@
         mutt_attach_display_loop (menu, op, NULL, NULL, NULL, &idx, &idxlen, NULL, 0);
         menu->redraw = REDRAW_FULL;
+        /* no send2hook, since this doesn't modify the message */
         break;
 
@@ -1084 +1113 @@
         mutt_save_attachment_list (NULL, menu->tagprefix, menu->tagprefix ?  msg->content : idx[menu->current]->content, NULL, menu);
         MAYBE_REDRAW (menu->redraw);
+        /* no send2hook, since this doesn't modify the message */
         break;
 
@@ -1089 +1119 @@
         CHECK_COUNT;
         mutt_print_attachment_list (NULL, menu->tagprefix, menu->tagprefix ? msg->content : idx[menu->current]->content);
+        /* no send2hook, since this doesn't modify the message */
         break;
 
@@ -1096 +1127 @@
         mutt_pipe_attachment_list (NULL, menu->tagprefix, menu->tagprefix ? msg->content : idx[menu->current]->content, op == OP_FILTER);
         if (op == OP_FILTER) /* cte might have changed */
-          menu->redraw = menu->tagprefix ? REDRAW_FULL : REDRAW_CURRENT; 
+          menu->redraw = menu->tagprefix ? REDRAW_FULL : REDRAW_CURRENT;
         menu->redraw |= REDRAW_STATUS;
+        mutt_message_hook (NULL, msg, M_SEND2HOOK);
         break;
 
@@ -1192 +1224 @@
         msg->security = crypt_pgp_send_menu (msg, &menu->redraw);
         redraw_crypt_lines (msg);
-        break;
+        mutt_message_hook (NULL, msg, M_SEND2HOOK);
+        break;
 
 
@@ -1217 +1250 @@
         msg->security = crypt_smime_send_menu(msg, &menu->redraw);
         redraw_crypt_lines (msg);
-        break;
+        mutt_message_hook (NULL, msg, M_SEND2HOOK);
+        break;
 
 
@@ -1224 +1258 @@
       
         mix_make_chain (&msg->chain, &menu->redraw);
+        mutt_message_hook (NULL, msg, M_SEND2HOOK);
         break;
 #endif