rename a bunch of modules

[apps/madmutt.git] / send.c

diff --git a/send.c b/send.c
index 0d25bc1..db26a3d 100644 (file)
--- 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+");
@@ -1360,7 +1360,7 @@ int ci_send_message (int flags, /* send mode */
        * for the decision. 
        */
       if (!(msg->security & (APPLICATION_SMIME | APPLICATION_PGP))) {
-        if (mod_crypt.autosmime && option(OPTSMIMEISDEFAULT))
+        if (mod_crypt.autosmime && mod_crypt.smime_is_default)
           msg->security |= APPLICATION_SMIME;
         else if (mod_crypt.autopgp)
           msg->security |= APPLICATION_PGP;