remove option OPTSAVEUNSUB. This sucks, writing 2Mo of file is easy.

[apps/madmutt.git] / init.c

diff --git a/init.c b/init.c
index b0f4ac3..a0d194d 100644 (file)
--- a/init.c
+++ b/init.c
@@ -24,7 +24,6 @@
 #include "charset.h"
 #include "thread.h"
 #include "mutt_idna.h"
-#include "send_smtp.h"
 #include "alias.h"
 #include "init.h"
 
@@ -328,7 +327,6 @@ static void magic_to_string (char* dst, ssize_t dstlen,
   const char* s = NULL;
   switch (option->data) {
     case M_MBOX:    s = "mbox"; break;
-    case M_MMDF:    s = "MMDF"; break;
     case M_MH:      s = "MH"; break;
     case M_MAILDIR: s = "Maildir"; break;
     default:        s = "unknown"; break;
@@ -337,15 +335,14 @@ static void magic_to_string (char* dst, ssize_t dstlen,
 }
 
 static int magic_from_string (struct option_t* dst, const char* val,
-                              char* errbuf __attribute__ ((unused)), ssize_t errlen __attribute__ ((unused))) {
+                              char *errbuf, ssize_t errlen)
+{
   int flag = -1;
 
   if (!dst || m_strisempty(val))
     return (0);
   if (ascii_strncasecmp (val, "mbox", 4) == 0)
     flag = M_MBOX;
-  else if (ascii_strncasecmp (val, "mmdf", 4) == 0)
-    flag = M_MMDF;
   else if (ascii_strncasecmp (val, "mh", 2) == 0)
     flag = M_MH;
   else if (ascii_strncasecmp (val, "maildir", 7) == 0)
@@ -1234,12 +1231,12 @@ static int source_rc (const char *rcfile, BUFFER * err)
 
   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 (&currentline, ConfigCharset, MCharset.charset, 0);
+      mutt_convert_string (&currentline, ConfigCharset, mod_cset.charset, 0);
     }
     else
       currentline = linebuf;
@@ -1603,12 +1600,9 @@ int mutt_var_value_complete (char *buffer, ssize_t len, int pos)
           case M_MBOX:
             p = "mbox";
             break;
-          case M_MMDF:
-            p = "MMDF";
-            break;
           case M_MH:
             p = "MH";
-          break;
+            break;
           case M_MAILDIR:
             p = "Maildir";
             break;
@@ -1716,7 +1710,7 @@ void mutt_init (int skip_sys_rc, string_list_t * commands)
   /* 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);
   }
 
@@ -1744,11 +1738,7 @@ void mutt_init (int skip_sys_rc, string_list_t * commands)
   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);
   }
 
@@ -1781,10 +1771,10 @@ void mutt_init (int skip_sys_rc, string_list_t * commands)
   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);
@@ -1835,9 +1825,9 @@ void mutt_init (int skip_sys_rc, string_list_t * commands)
   }
 
   /* 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));
   }