projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove cruft
[apps/madmutt.git]
/
init.c
diff --git
a/init.c
b/init.c
index
2270910
..
f318903
100644
(file)
--- a/
init.c
+++ b/
init.c
@@
-14,7
+14,6
@@
#include <lib-lua/lib-lua.h>
#include <lib-sys/unix.h>
#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-ui/curses.h>
#include <lib-ui/history.h>
#include <lib-mx/mx.h>
@@
-83,7
+82,7
@@
static struct {
int (*check) (const char* option, unsigned long val,
char* errbuf, ssize_t errlen);
} SpecialVars[] = {
int (*check) (const char* option, unsigned long val,
char* errbuf, ssize_t errlen);
} SpecialVars[] = {
-#if
defined (USE_LIBESMTP) && (defined (USE_SSL) || defined (USE_GNUTLS))
+#if
def USE_LIBESMTP
{ "smtp_use_tls", send_smtp_check_usetls },
#endif
{ "history", check_history },
{ "smtp_use_tls", send_smtp_check_usetls },
#endif
{ "history", check_history },
@@
-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;
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;
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,
}
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;
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)
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_MBOX:
p = "mbox";
break;
- case M_MMDF:
- p = "MMDF";
- break;
case M_MH:
p = "MH";
case M_MH:
p = "MH";
- break;
+
break;
case M_MAILDIR:
p = "Maildir";
break;
case M_MAILDIR:
p = "Maildir";
break;
@@
-1745,11
+1739,7
@@
void mutt_init (int skip_sys_rc, string_list_t * commands)
if ((p = getenv("MAIL") ?: getenv("MAILDIR"))) {
Spoolfile = m_strdup(p);
} else {
if ((p = getenv("MAIL") ?: getenv("MAILDIR"))) {
Spoolfile = m_strdup(p);
} else {
-#ifdef HOMESPOOL
mutt_concat_path(buffer, sizeof(buffer), NONULL(MCore.homedir), MAILPATH);
mutt_concat_path(buffer, sizeof(buffer), NONULL(MCore.homedir), MAILPATH);
-#else
- mutt_concat_path(buffer, sizeof(buffer), MAILPATH, NONULL(MCore.username));
-#endif
Spoolfile = m_strdup(buffer);
}
Spoolfile = m_strdup(buffer);
}