#include "charset.h"
#include "thread.h"
#include "mutt_idna.h"
-#include "send_smtp.h"
#include "alias.h"
#include "init.h"
p_clear(&token, 1);
while ((linebuf = mutt_read_line(linebuf, &buflen, f, &line)) != NULL) {
- conv = ConfigCharset && (*ConfigCharset) && MCharset.charset;
+ conv = ConfigCharset && (*ConfigCharset) && mod_cset.charset;
if (conv) {
currentline = m_strdup(linebuf);
if (!currentline)
continue;
- mutt_convert_string (¤tline, ConfigCharset, MCharset.charset, 0);
+ mutt_convert_string (¤tline, ConfigCharset, mod_cset.charset, 0);
}
else
currentline = linebuf;
/* Get some information about the user */
if ((pw = getpwuid (getuid ()))) {
char rnbuf[STRING];
- mutt_gecos_name(rnbuf, sizeof(rnbuf), pw, MCore.gecos_mask);
+ mutt_gecos_name(rnbuf, sizeof(rnbuf), pw, mod_core.gecos_mask);
Realname = m_strdup(rnbuf);
}
if ((p = getenv("MAIL") ?: getenv("MAILDIR"))) {
Spoolfile = m_strdup(p);
} else {
-#ifdef HOMESPOOL
- mutt_concat_path(buffer, sizeof(buffer), NONULL(MCore.homedir), MAILPATH);
-#else
- mutt_concat_path(buffer, sizeof(buffer), MAILPATH, NONULL(MCore.username));
-#endif
+ mutt_concat_path(buffer, sizeof(buffer), NONULL(mod_core.homedir), MAILPATH);
Spoolfile = m_strdup(buffer);
}
mutt_init_history ();
if (!Muttrc) {
- snprintf (buffer, sizeof(buffer), "%s/.madmuttrc", NONULL(MCore.homedir));
+ snprintf (buffer, sizeof(buffer), "%s/.madmuttrc", NONULL(mod_core.homedir));
if (access (buffer, F_OK) == -1)
snprintf (buffer, sizeof(buffer), "%s/.madmutt/madmuttrc",
- NONULL(MCore.homedir));
+ NONULL(mod_core.homedir));
default_rc = 1;
Muttrc = m_strdup(buffer);
}
/* LUA {{{ */
- snprintf(buffer, sizeof(buffer), "%s/.madmutt.lua", NONULL(MCore.homedir));
+ snprintf(buffer, sizeof(buffer), "%s/.madmutt.lua", NONULL(mod_core.homedir));
if (access(buffer, F_OK) < 0)
- snprintf(buffer, sizeof(buffer), "%s/.madmutt/cfg.lua", NONULL(MCore.homedir));
+ snprintf(buffer, sizeof(buffer), "%s/.madmutt/cfg.lua", NONULL(mod_core.homedir));
if (!access(buffer, F_OK)) {
need_pause = luaM_wrap(mutt_error, luaM_dofile(buffer));
}