X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=send.c;h=db26a3deb5c594d7b7ab5cd9a95f7cbf1bf4ab28;hp=e40d3daf0edc0a2ed5707e6fc07106fe8cb4b403;hb=f9b57894566719355febb25ad0b1e3e4ef7ffce9;hpb=91acd32003fb8eb9b3b05b35c1aa32a6c07aad43

diff --git a/send.c b/send.c
index e40d3da..db26a3d 100644
--- a/send.c
+++ b/send.c
@@ -990,14 +990,14 @@ address_t *mutt_default_from (void)
 
   if (MAlias.from)
     adr = address_dup(MAlias.from);
-  else if (MCore.use_domain) {
+  else if (mod_core.use_domain) {
     const char *fqdn = mutt_fqdn (1);
     adr = address_new();
-    adr->mailbox = p_new(char, m_strlen(MCore.username) + m_strlen(fqdn) + 2);
-    sprintf(adr->mailbox, "%s@%s", NONULL(MCore.username), NONULL(fqdn));
+    adr->mailbox = p_new(char, m_strlen(mod_core.username) + m_strlen(fqdn) + 2);
+    sprintf(adr->mailbox, "%s@%s", NONULL(mod_core.username), NONULL(fqdn));
   } else {
     adr = address_new ();
-    adr->mailbox = m_strdup(NONULL(MCore.username));
+    adr->mailbox = m_strdup(NONULL(mod_core.username));
   }
 
   return (adr);
@@ -1010,7 +1010,7 @@ static int send_message (HEADER * msg)
   int i;
 
   /* Write out the message in MIME form. */
-  tempfp = m_tempfile(tempfile, sizeof(tempfile), NONULL(MCore.tmpdir), NULL);
+  tempfp = m_tempfile(tempfile, sizeof(tempfile), NONULL(mod_core.tmpdir), NULL);
   if (!tempfp)
     return -1;
 
@@ -1208,7 +1208,7 @@ int ci_send_message (int flags, /* send mode */
 
     if (!tempfile) {
       char buffer[_POSIX_PATH_MAX];
-      tempfp = m_tempfile(buffer, sizeof(buffer), NONULL(MCore.tmpdir), NULL);
+      tempfp = m_tempfile(buffer, sizeof(buffer), NONULL(mod_core.tmpdir), NULL);
       msg->content->filename = m_strdup(buffer);
     } else {
       tempfp = safe_fopen(tempfile, "a+");