projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
not having wide chars is soooo 90, please, I *really* don't care with
[apps/madmutt.git]
/
main.c
diff --git
a/main.c
b/main.c
index
ab893ca
..
e3a0b83
100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-32,6
+32,11
@@
#include <lib-lib/macros.h>
#include <lib-lib/file.h>
#include <lib-lib/debug.h>
#include <lib-lib/macros.h>
#include <lib-lib/file.h>
#include <lib-lib/debug.h>
+#include <lib-lib/url.h>
+
+#include <lib-sys/mutt_signal.h>
+
+#include <lib-mime/mime.h>
#include <lib-ui/curses.h>
#include <lib-ui/curses.h>
@@
-41,7
+46,6
@@
#include "sort.h"
#include <lib-crypt/crypt.h>
#include "keymap.h"
#include "sort.h"
#include <lib-crypt/crypt.h>
#include "keymap.h"
-#include "url.h"
#include "mutt_idna.h"
#include "xterm.h"
#include "mutt_idna.h"
#include "xterm.h"
@@
-465,17
+469,14
@@
static void start_curses (void)
#else
/* should come before initscr() so that ncurses 4.2 doesn't try to install
its own SIGWINCH handler */
#else
/* should come before initscr() so that ncurses 4.2 doesn't try to install
its own SIGWINCH handler */
- mutt_signal_init ();
+ mutt_signal_init
ialize
();
#endif
if (initscr () == NULL) {
puts _("Error initializing terminal.");
exit (1);
}
#endif
if (initscr () == NULL) {
puts _("Error initializing terminal.");
exit (1);
}
-#if 1 /* USE_SLANG_CURSES - commenting out suggested in #455. */
- /* slang requires the signal handlers to be set after initializing */
- mutt_signal_init ();
-#endif
+ mutt_signal_initialize ();
ci_start_color ();
keypad (stdscr, TRUE);
cbreak ();
ci_start_color ();
keypad (stdscr, TRUE);
cbreak ();
@@
-505,10
+506,10
@@
int main (int argc, char **argv)
char *draftFile = NULL;
char *newMagic = NULL;
HEADER *msg = NULL;
char *draftFile = NULL;
char *newMagic = NULL;
HEADER *msg = NULL;
-
LIST
*attach = NULL;
-
LIST
*commands = NULL;
-
LIST
*queries = NULL;
-
LIST
*alias_queries = NULL;
+
string_list_t
*attach = NULL;
+
string_list_t
*commands = NULL;
+
string_list_t
*queries = NULL;
+
string_list_t
*alias_queries = NULL;
int sendflags = 0;
int flags = 0;
int version = 0;
int sendflags = 0;
int flags = 0;
int version = 0;
@@
-705,7
+706,7
@@
int main (int argc, char **argv)
/* set defaults and read init files */
mx_init ();
mutt_init (flags & M_NOSYSRC, commands);
/* set defaults and read init files */
mx_init ();
mutt_init (flags & M_NOSYSRC, commands);
-
mutt_free_list
(&commands);
+
string_list_wipe
(&commands);
/* Initialize crypto */
crypt_init ();
/* Initialize crypto */
crypt_init ();
@@
-720,7
+721,7
@@
int main (int argc, char **argv)
address_t *a;
for (; alias_queries; alias_queries = alias_queries->next) {
address_t *a;
for (; alias_queries; alias_queries = alias_queries->next) {
- if ((a =
mutt_lookup_alias
(alias_queries->data))) {
+ if ((a =
alias_lookup
(alias_queries->data))) {
/* output in machine-readable form */
mutt_addrlist_to_idna (a, NULL);
mutt_write_address_list (a, stdout, 0, 0);
/* output in machine-readable form */
mutt_addrlist_to_idna (a, NULL);
mutt_write_address_list (a, stdout, 0, 0);
@@
-861,7
+862,7
@@
int main (int argc, char **argv)
p_delete(&bodytext);
if (attach) {
p_delete(&bodytext);
if (attach) {
-
LIST
*t = attach;
+
string_list_t
*t = attach;
BODY *a = NULL;
while (t) {
BODY *a = NULL;
while (t) {
@@
-875,12
+876,12
@@
int main (int argc, char **argv)
if (!option (OPTNOCURSES))
mutt_endwin (NULL);
fprintf (stderr, _("%s: unable to attach file.\n"), t->data);
if (!option (OPTNOCURSES))
mutt_endwin (NULL);
fprintf (stderr, _("%s: unable to attach file.\n"), t->data);
-
mutt_free_list
(&attach);
+
string_list_wipe
(&attach);
exit (1);
}
t = t->next;
}
exit (1);
}
t = t->next;
}
-
mutt_free_list
(&attach);
+
string_list_wipe
(&attach);
}
ci_send_message (sendflags, msg, tempfile, NULL, NULL);
}
ci_send_message (sendflags, msg, tempfile, NULL, NULL);