X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=main.c;h=9cf043719b67b9c780466100e789bc1162dfd697;hp=56030ee48350371eff09e9a1d1ec26af442fe73a;hb=186cc3cb513f2387959888d896dbf67b250a9035;hpb=a8808601c98c76ec8344c8e4ba5a607d72c2805e

diff --git a/main.c b/main.c
index 56030ee..9cf0437 100644
--- a/main.c
+++ b/main.c
@@ -588,9 +588,9 @@ int main (int argc, char **argv)
     case 'b':
     case 'c':
       if (!msg)
-        msg = mutt_new_header ();
+        msg = header_new();
       if (!msg->env)
-        msg->env = mutt_new_envelope ();
+        msg->env = envelope_new();
       if (i == 'b')
         msg->env->bcc = rfc822_parse_adrlist (msg->env->bcc, optarg);
       else
@@ -760,16 +760,16 @@ int main (int argc, char **argv)
   if (!option (OPTNOCURSES) && Maildir) {
     struct stat sb;
     char fpath[_POSIX_PATH_MAX];
-    char msg[STRING];
+    char mesg[STRING];
 
     m_strcpy(fpath, sizeof(fpath), Maildir);
     mutt_expand_path (fpath, sizeof (fpath));
     /* we're not connected yet - skip mail folder creation */
     if (mx_get_magic (fpath) != M_IMAP)
       if (stat (fpath, &sb) == -1 && errno == ENOENT) {
-        snprintf (msg, sizeof (msg), _("%s does not exist. Create it?"),
+        snprintf (mesg, sizeof (mesg), _("%s does not exist. Create it?"),
                   Maildir);
-        if (mutt_yesorno (msg, M_YES) == M_YES) {
+        if (mutt_yesorno (mesg, M_YES) == M_YES) {
           if (mkdir (fpath, 0700) == -1 && errno != EEXIST)
             mutt_error (_("Can't create %s: %s."), Maildir, strerror (errno));
         }
@@ -793,13 +793,13 @@ int main (int argc, char **argv)
       mutt_flushinp ();
 
     if (!msg)
-      msg = mutt_new_header ();
+      msg = header_new();
 
     if (draftFile)
       infile = draftFile;
     else {
       if (!msg->env)
-        msg->env = mutt_new_envelope ();
+        msg->env = envelope_new();
 
       for (i = optind; i < argc; i++) {
         if (url_check_scheme (argv[i]) == U_MAILTO)