X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=send.c;h=3bddf4e9328bb81632376ab1369059814f24cbf0;hb=d56fddbfbd785459ebbfba6d3ab7c233bbadf3c1;hp=4d5cd0952787289c128e05447b6e5b4ec13d6ca2;hpb=923e295d2cd179be0ab05890c9788bb822b1b340;p=apps%2Fmadmutt.git

diff --git a/send.c b/send.c
index 4d5cd09..3bddf4e 100644
--- a/send.c
+++ b/send.c
@@ -97,7 +97,7 @@ static void append_signature (FILE * f)
     fprintf (f, "\n%s", SignOffString);
   }
 
-  if (Signature && (tmpfp = mutt_open_read (Signature, &thepid))) {
+  if (tmpfp = mutt_open_read(NONULL(MAlias.signature), &thepid)) {
     if (option (OPTSIGDASHES))
       fputs ("\n-- \n", f);
     else if (SignOffString)
@@ -1022,8 +1022,8 @@ address_t *mutt_default_from (void)
    * Is this the right thing to do?
    */
 
-  if (From)
-    adr = address_dup(From);
+  if (MAlias.from)
+    adr = address_dup(MAlias.from);
   else if (MCore.use_domain) {
     const char *fqdn = mutt_fqdn (1);
     adr = address_new();