X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=init.c;h=48a202435a97776dd446e10c3cd16d348ebd2038;hp=fb2f8a6ccfffcabd11b7cdbe60d99ded28a5763f;hb=612f19a8b9172f6c0b32d929a53e95c995f78b1e;hpb=204ddf09d4f46b07c86e36a796788c081b9f7277

diff --git a/init.c b/init.c
index fb2f8a6..48a2024 100644
--- a/init.c
+++ b/init.c
@@ -14,18 +14,17 @@
 
 #include <lib-lua/lib-lua.h>
 #include <lib-sys/unix.h>
-#include <lib-sys/mutt_ssl.h>
 #include <lib-ui/curses.h>
 #include <lib-ui/history.h>
 #include <lib-mx/mx.h>
-#include <lib-crypt/crypt.h>
 
 #include "mutt.h"
 #include "keymap.h"
+#include "crypt.h"
 #include "charset.h"
 #include "thread.h"
 #include "mutt_idna.h"
-#include "mutt_libesmtp.h"
+#include "send_smtp.h"
 #include "alias.h"
 #include "init.h"
 
@@ -83,8 +82,8 @@ static struct {
   int (*check) (const char* option, unsigned long val,
                 char* errbuf, ssize_t errlen);
 } SpecialVars[] = {
-#if defined (USE_LIBESMTP) && (defined (USE_SSL) || defined (USE_GNUTLS))
-  { "smtp_use_tls",             mutt_libesmtp_check_usetls },
+#ifdef USE_LIBESMTP
+  { "smtp_use_tls",             send_smtp_check_usetls },
 #endif
   { "history",                  check_history },
   { "pager_index_lines",        check_num },
@@ -329,7 +328,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;
@@ -338,15 +336,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)
@@ -1604,12 +1601,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;