projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
simplifications.
[apps/madmutt.git]
/
main.c
diff --git
a/main.c
b/main.c
index
e0c00f2
..
f7734fb
100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-46,11
+46,7
@@
extern int optind;
#endif
#ifdef USE_NNTP
#endif
#ifdef USE_NNTP
-#include <nntp/nntp.h>
-#endif
-
-#ifdef USE_LIBESMTP
-#include <libesmtp.h>
+#include "nntp.h"
#endif
#ifdef USE_HCACHE
#endif
#ifdef USE_HCACHE
@@
-130,9
+126,6
@@
options:\n\
static void show_version (void)
{
struct utsname uts;
static void show_version (void)
{
struct utsname uts;
-#ifdef USE_LIBESMTP
- char buf[STRING];
-#endif
puts (mutt_make_version());
puts (_(Notice));
puts (mutt_make_version());
puts (_(Notice));
@@
-165,11
+158,6
@@
static void show_version (void)
stringprep_check_version (NULL), STRINGPREP_VERSION);
#endif
stringprep_check_version (NULL), STRINGPREP_VERSION);
#endif
-#ifdef USE_LIBESMTP
- smtp_version (buf, sizeof (buf), 0);
- printf (" libESMTP %s\n", buf);
-#endif
-
#ifdef USE_HCACHE
#if defined(HAVE_QDBM)
printf (" qdbm %s\n", dpversion);
#ifdef USE_HCACHE
#if defined(HAVE_QDBM)
printf (" qdbm %s\n", dpversion);
@@
-210,11
+198,6
@@
static void show_version (void)
#else
"-USE_NNTP "
#endif
#else
"-USE_NNTP "
#endif
-#ifdef USE_LIBESMTP
- "+USE_LIBESMTP "
-#else
- "-USE_LIBESMTP "
-#endif
#ifdef HAVE_LIBIDN
"+HAVE_LIBIDN "
#else
#ifdef HAVE_LIBIDN
"+HAVE_LIBIDN "
#else
@@
-589,7
+572,7
@@
int main (int argc, char **argv)
/* is the following if still needed? */
/* is the following if still needed? */
- fout = m_tempfile(buf, sizeof(buf), NONULL(
MC
ore.tmpdir), NULL);
+ fout = m_tempfile(buf, sizeof(buf), NONULL(
mod_c
ore.tmpdir), NULL);
tempfile = m_strdup(buf);
if (tempfile) {
tempfile = m_strdup(buf);
if (tempfile) {
@@
-667,7
+650,8
@@
int main (int argc, char **argv)
exit (1);
}
folder[0] = 0;
exit (1);
}
folder[0] = 0;
- mutt_select_file (folder, sizeof (folder), M_SEL_FOLDER | M_SEL_BUFFY);
+ mutt_select_file(folder, sizeof(folder), M_SEL_FOLDER | M_SEL_BUFFY,
+ NULL, NULL);
if (!folder[0]) {
mutt_endwin (NULL);
exit (0);
if (!folder[0]) {
mutt_endwin (NULL);
exit (0);