rename a bunch of modules

[apps/madmutt.git] / sendlib.c

diff --git a/sendlib.c b/sendlib.c
index 1926dc6..49d4140 100644 (file)
--- a/sendlib.c
+++ b/sendlib.c
@@ -758,10 +758,10 @@ CONTENT *mutt_get_content_info (const char *fname, BODY * b)
 
   if (b != NULL && b->type == TYPETEXT && (!b->noconv && !b->force_charset)) {
     const char *chs = parameter_getval(b->parameter, "charset");
-    char *fchs = b->use_disp && !m_strisempty(MCharset.file_charset)
-        ? FileCharset : MCharset.charset;
-    if (MCharset.charset && (chs || MCharset.send_charset) &&
-        convert_file_from_to (fp, fchs, chs ? chs : MCharset.send_charset,
+    char *fchs = b->use_disp && !m_strisempty(mod_cset.file_charset)
+        ? FileCharset : mod_cset.charset;
+    if (mod_cset.charset && (chs || mod_cset.send_charset) &&
+        convert_file_from_to (fp, fchs, chs ? chs : mod_cset.send_charset,
                               &fromcode, &tocode, info) != -1) {
       if (!chs) {
         charset_canonicalize (chsbuf, sizeof (chsbuf), tocode);
@@ -784,8 +784,8 @@ CONTENT *mutt_get_content_info (const char *fname, BODY * b)
   if (b != NULL && b->type == TYPETEXT && (!b->noconv && !b->force_charset))
     parameter_setval(&b->parameter, "charset",
                      (!info->hibin ? "us-ascii"
-                      : MCharset.charset && !charset_is_us_ascii(MCharset.charset)
-                                         ? MCharset.charset : "unknown-8bit"));
+                      : mod_cset.charset && !charset_is_us_ascii(mod_cset.charset)
+                                         ? mod_cset.charset : "unknown-8bit"));
 
   return info;
 }
@@ -821,7 +821,7 @@ int mutt_lookup_mime_type (BODY * att, const char *path)
      */
     switch (count) {
     case 0:
-      snprintf(buf, sizeof (buf), "%s/.mime.types", NONULL(MCore.homedir));
+      snprintf(buf, sizeof (buf), "%s/.mime.types", NONULL(mod_core.homedir));
       break;
     case 1:
       m_strcpy(buf, sizeof(buf), SYSCONFDIR "/madmutt-mime.types");
@@ -917,7 +917,7 @@ void mutt_message_to_7bit (BODY * a, FILE * fp)
     a->length = sb.st_size;
   }
 
-  fpout = m_tempfile(temp, sizeof(temp), NONULL(MCore.tmpdir), NULL);
+  fpout = m_tempfile(temp, sizeof(temp), NONULL(mod_core.tmpdir), NULL);
   if (!fpout) {
     mutt_error(_("Could not create temporary file"));
     goto cleanup;
@@ -982,7 +982,7 @@ static void transform_to_7bit (BODY * a, FILE * fpin)
       a->noconv = 1;
       a->force_charset = 1;
 
-      s.fpout = m_tempfile(buff, sizeof(buff), NONULL(MCore.tmpdir), NULL);
+      s.fpout = m_tempfile(buff, sizeof(buff), NONULL(mod_core.tmpdir), NULL);
       if (!s.fpout) {
         mutt_error(_("Could not create temporary file"));
         return;
@@ -1104,7 +1104,7 @@ BODY *mutt_make_message_attach (CONTEXT * ctx, HEADER * hdr, int attach_msg)
       (hdr->security & ENCRYPT)) {
   }
 
-  fp = m_tempfile(buffer, sizeof(buffer), NONULL(MCore.tmpdir), NULL);
+  fp = m_tempfile(buffer, sizeof(buffer), NONULL(mod_core.tmpdir), NULL);
   if (!fp)
     return NULL;
 
@@ -1487,9 +1487,9 @@ int mutt_write_rfc822_header (FILE * fp, ENVELOPE * env, BODY * attach,
   }
 
   if (mode == 0 && !privacy && option (OPTXMAILER) && !has_agent) {
-    if (MCore.operating_system) {
+    if (mod_core.operating_system) {
       fprintf(fp, "User-Agent: %s (%s)\n", mutt_make_version(),
-              MCore.operating_system);
+              mod_core.operating_system);
     } else {
       fprintf(fp, "User-Agent: %s\n", mutt_make_version());
     }
@@ -1528,18 +1528,18 @@ const char *mutt_fqdn(short may_hide_host)
 {
   char *p = NULL, *q;
 
-  if (MCore.hostname && MCore.hostname[0] != '@') {
-    p = MCore.hostname;
+  if (mod_core.hostname && mod_core.hostname[0] != '@') {
+    p = mod_core.hostname;
 
     if (may_hide_host && option (OPTHIDDENHOST)) {
-      if ((p = strchr(MCore.hostname, '.')))
+      if ((p = strchr(mod_core.hostname, '.')))
         p++;
 
       /* sanity check: don't hide the host if
          the fqdn is something like detebe.org.  */
 
       if (!p || !(q = strchr(p, '.')))
-        p = MCore.hostname;
+        p = mod_core.hostname;
     }
   }
 
@@ -1642,7 +1642,7 @@ static char *mutt_gen_msgid (void)
     const char *fqdn;
 
     if (!(fqdn = mutt_fqdn(0)))
-        fqdn = NONULL(MCore.shorthost);
+        fqdn = NONULL(mod_core.shorthost);
 
     mutt_gen_localpart(localpart, sizeof(localpart), MsgIdFormat);
     snprintf(buf, sizeof(buf), "<%s@%s>", localpart, fqdn);
@@ -2016,7 +2016,7 @@ static int _mutt_bounce_message (FILE * fp, HEADER * h, address_t * to,
   if (!fp)
     fp = msg->fp;
 
-  f = m_tempfile(tempfile, sizeof(tempfile), NONULL(MCore.tmpdir), NULL);
+  f = m_tempfile(tempfile, sizeof(tempfile), NONULL(mod_core.tmpdir), NULL);
   if (f) {
     int ch_flags = CH_XMIT | CH_NONEWLINE | CH_NOQFROM;
 
@@ -2106,7 +2106,7 @@ int mutt_write_fcc (const char *path, HEADER * hdr, const char *msgid,
    * the message body begins with "From "   
    */
   if (f.magic == M_MBOX) {
-    tempfp = m_tempfile(tempfile, sizeof(tempfile), NONULL(MCore.tmpdir), NULL);
+    tempfp = m_tempfile(tempfile, sizeof(tempfile), NONULL(mod_core.tmpdir), NULL);
     if (!tempfp) {
       mutt_error(_("Could not create temporary file"));
       mx_close_mailbox (&f, NULL);