projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
useless file.
[apps/madmutt.git]
/
recvcmd.c
diff --git
a/recvcmd.c
b/recvcmd.c
index
f504547
..
4e37015
100644
(file)
--- a/
recvcmd.c
+++ b/
recvcmd.c
@@
-7,15
+7,7
@@
* please see the file GPL in the top level source directory.
*/
* please see the file GPL in the top level source directory.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/macros.h>
-#include <lib-lib/file.h>
-#include <lib-lib/mapping.h>
+#include <lib-lib/lib-lib.h>
#include <lib-mime/mime.h>
#include <lib-mime/mime.h>
@@
-24,10
+16,10
@@
#include <lib-ui/menu.h>
#include "mutt.h"
#include <lib-ui/menu.h>
#include "mutt.h"
+#include "alias.h"
#include "state.h"
#include "handler.h"
#include "recvattach.h"
#include "state.h"
#include "handler.h"
#include "recvattach.h"
-#include "rfc1524.h"
#include "attach.h"
#include "mx.h"
#include "copy.h"
#include "attach.h"
#include "mx.h"
#include "copy.h"
@@
-115,9
+107,7
@@
static short count_tagged_children (ATTACHPTR ** idx, short idxlen, short i)
/**
/**
- **
** The bounce function, from the attachment menu
** The bounce function, from the attachment menu
- **
**/
void mutt_attach_bounce (FILE * fp, HEADER * hdr __attribute__ ((unused)),
**/
void mutt_attach_bounce (FILE * fp, HEADER * hdr __attribute__ ((unused)),
@@
-126,7
+116,7
@@
void mutt_attach_bounce (FILE * fp, HEADER * hdr __attribute__ ((unused)),
short i;
char prompt[STRING];
char buf[HUGE_STRING];
short i;
char prompt[STRING];
char buf[HUGE_STRING];
- c
onst c
har *err = NULL;
+ char *err = NULL;
address_t *adr = NULL;
int ret = 0;
int p = 0;
address_t *adr = NULL;
int ret = 0;
int p = 0;
@@
-158,7
+148,7
@@
void mutt_attach_bounce (FILE * fp, HEADER * hdr __attribute__ ((unused)),
if (mutt_addrlist_to_idna (adr, &err) < 0) {
mutt_error (_("Bad IDN: '%s'"), err);
p_delete(&err);
if (mutt_addrlist_to_idna (adr, &err) < 0) {
mutt_error (_("Bad IDN: '%s'"), err);
p_delete(&err);
- address_
delete
(&adr);
+ address_
list_wipe
(&adr);
return;
}
return;
}
@@
-183,7
+173,7
@@
void mutt_attach_bounce (FILE * fp, HEADER * hdr __attribute__ ((unused)),
}
if (query_quadoption (OPT_BOUNCE, prompt) != M_YES) {
}
if (query_quadoption (OPT_BOUNCE, prompt) != M_YES) {
- address_
delete
(&adr);
+ address_
list_wipe
(&adr);
CLEARLINE (LINES - 1);
mutt_message (p ? _("Message not bounced.") : _("Messages not bounced."));
return;
CLEARLINE (LINES - 1);
mutt_message (p ? _("Message not bounced.") : _("Messages not bounced."));
return;
@@
-211,10
+201,7
@@
void mutt_attach_bounce (FILE * fp, HEADER * hdr __attribute__ ((unused)),
/**
/**
- **
** resend-message, from the attachment menu
** resend-message, from the attachment menu
- **
- **
**/
void mutt_attach_resend (FILE * fp, HEADER * hdr __attribute__ ((unused)), ATTACHPTR ** idx,
**/
void mutt_attach_resend (FILE * fp, HEADER * hdr __attribute__ ((unused)), ATTACHPTR ** idx,
@@
-236,9
+223,7
@@
void mutt_attach_resend (FILE * fp, HEADER * hdr __attribute__ ((unused)), ATTAC
\f
/**
\f
/**
- **
** forward-message, from the attachment menu
** forward-message, from the attachment menu
- **
**/
/* try to find a common parent message for the tagged attachments. */
**/
/* try to find a common parent message for the tagged attachments. */
@@
-640,10
+625,7
@@
void mutt_attach_forward (FILE * fp, HEADER * hdr,
/**
/**
- **
** the various reply functions, from the attachment menu
** the various reply functions, from the attachment menu
- **
- **
**/
/* Create the envelope defaults for a reply.
**/
/* Create the envelope defaults for a reply.
@@
-723,7
+705,7
@@
attach_reply_envelope_defaults (ENVELOPE * env, ATTACHPTR ** idx,
if (parent)
mutt_add_to_reference_headers (env, curenv, NULL, NULL);
else {
if (parent)
mutt_add_to_reference_headers (env, curenv, NULL, NULL);
else {
-
LIST
**p = NULL, **q = NULL;
+
string_list_t
**p = NULL, **q = NULL;
for (i = 0; i < idxlen; i++) {
if (idx[i]->content->tagged)
for (i = 0; i < idxlen; i++) {
if (idx[i]->content->tagged)