else if (option (OPTUSEDOMAIN)) {
const char *fqdn = mutt_fqdn (1);
adr = address_new();
- adr->mailbox = p_new(char, m_strlen(Username) + m_strlen(fqdn) + 2);
- sprintf(adr->mailbox, "%s@%s", NONULL(Username), NONULL(fqdn));
+ adr->mailbox = p_new(char, m_strlen(MCore.username) + m_strlen(fqdn) + 2);
+ sprintf(adr->mailbox, "%s@%s", NONULL(MCore.username), NONULL(fqdn));
} else {
adr = address_new ();
- adr->mailbox = m_strdup(NONULL(Username));
+ adr->mailbox = m_strdup(NONULL(MCore.username));
}
return (adr);
int i;
/* Write out the message in MIME form. */
- tempfp = m_tempfile(tempfile, sizeof(tempfile), NONULL(Tempdir), NULL);
+ tempfp = m_tempfile(tempfile, sizeof(tempfile), NONULL(MCore.tmpdir), NULL);
if (!tempfp)
return -1;
if (!tempfile) {
char buffer[_POSIX_PATH_MAX];
- tempfp = m_tempfile(buffer, sizeof(buffer), NONULL(Tempdir), NULL);
+ tempfp = m_tempfile(buffer, sizeof(buffer), NONULL(MCore.tmpdir), NULL);
msg->content->filename = m_strdup(buffer);
} else {
tempfp = safe_fopen(tempfile, "a+");