Changeset 1603:63b61a63a908

Timestamp:

2000-03-04 00:40:52 (9 years ago)

Author:

Thomas Roessler <roessler@…>

Branch:

HEAD

Message:

Unify alias expansion.

Files:

• alias.c (modified) (1 diff)
• headers.c (modified) (1 diff)
• protos.h (modified) (1 diff)
• send.c (modified) (1 diff)

alias.c

@@ -140 +140 @@
 }
 
+void mutt_expand_aliases_env (ENVELOPE *env)
+{
+  env->from = mutt_expand_aliases (env->from);
+  env->to = mutt_expand_aliases (env->to);
+  env->cc = mutt_expand_aliases (env->cc);
+  env->bcc = mutt_expand_aliases (env->bcc);
+  env->reply_to = mutt_expand_aliases (env->reply_to);
+  env->mail_followup_to = mutt_expand_aliases (env->mail_followup_to);
+}
+
+
 /* 
  * if someone has an address like

headers.c

@@ -102 +102 @@
   msg->env = n;
 
-  msg->env->from = mutt_expand_aliases (msg->env->from);
-  msg->env->to = mutt_expand_aliases (msg->env->to);
-  msg->env->cc = mutt_expand_aliases (msg->env->cc);
-  msg->env->bcc = mutt_expand_aliases (msg->env->bcc);
-  msg->env->reply_to = mutt_expand_aliases (msg->env->reply_to);
-  msg->env->mail_followup_to = mutt_expand_aliases (msg->env->mail_followup_to);
-
+  mutt_expand_aliases_env (msg->env);
+  
   /* search through the user defined headers added to see if either a 
    * fcc: or attach-file: field was specified.  

protos.h

@@ -145 +145 @@
 void mutt_curses_error (const char *, ...);
 void mutt_enter_command (void);
+void mutt_expand_aliases_env (ENVELOPE *);
 void mutt_expand_file_fmt (char *, size_t, const char *, const char *);
 void mutt_expand_fmt (char *, size_t, const char *, const char *);

send.c

@@ -1043 +1043 @@
   if (msg)
   {
-    msg->env->to = mutt_expand_aliases (msg->env->to);
-    msg->env->cc = mutt_expand_aliases (msg->env->cc);
-    msg->env->bcc = mutt_expand_aliases (msg->env->bcc);
+    mutt_expand_aliases_env (msg->env);
   }
   else