projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sort out some prototypes, put them where they belong.
[apps/madmutt.git]
/
send.c
diff --git
a/send.c
b/send.c
index
fd0341b
..
4039463
100644
(file)
--- a/
send.c
+++ b/
send.c
@@
-23,12
+23,7
@@
#include <sys/types.h>
#include <utime.h>
#include <sys/types.h>
#include <utime.h>
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/ascii.h>
-#include <lib-lib/macros.h>
-#include <lib-lib/file.h>
-#include <lib-lib/url.h>
+#include <lib-lib/lib-lib.h>
#include <lib-mime/mime.h>
#include <lib-mime/rfc3676.h>
#include <lib-mime/mime.h>
#include <lib-mime/rfc3676.h>
@@
-585,25
+580,6
@@
int mutt_fetch_recips (ENVELOPE * out, ENVELOPE * in, int flags)
return 0;
}
return 0;
}
-string_list_t *mutt_make_references (ENVELOPE * e)
-{
- string_list_t *t = NULL, *l = NULL;
-
- if (e->references)
- l = string_list_dup(e->references);
- else
- l = string_list_dup(e->in_reply_to);
-
- if (e->message_id) {
- t = string_item_new();
- t->data = m_strdup(e->message_id);
- t->next = l;
- l = t;
- }
-
- return l;
-}
-
void mutt_fix_reply_recipients (ENVELOPE * env)
{
mutt_expand_aliases_env (env);
void mutt_fix_reply_recipients (ENVELOPE * env)
{
mutt_expand_aliases_env (env);
@@
-617,8
+593,8
@@
void mutt_fix_reply_recipients (ENVELOPE * env)
}
/* the CC field can get cluttered, especially with lists */
}
/* the CC field can get cluttered, especially with lists */
-
env->to = mutt_remove_duplicates (
env->to);
-
env->cc = mutt_remove_duplicates (
env->cc);
+
address_list_uniq(&
env->to);
+
address_list_uniq(&
env->cc);
env->cc = mutt_remove_xrefs (env->to, env->cc);
if (env->cc && !env->to) {
env->cc = mutt_remove_xrefs (env->to, env->cc);
if (env->cc && !env->to) {
@@
-656,6
+632,25
@@
void mutt_make_misc_reply_headers (ENVELOPE * env, CONTEXT * ctx,
#endif
}
#endif
}
+static string_list_t *mutt_make_references (ENVELOPE * e)
+{
+ string_list_t *t = NULL, *l = NULL;
+
+ if (e->references)
+ l = string_list_dup(e->references);
+ else
+ l = string_list_dup(e->in_reply_to);
+
+ if (e->message_id) {
+ t = string_item_new();
+ t->data = m_strdup(e->message_id);
+ t->next = l;
+ l = t;
+ }
+
+ return l;
+}
+
void mutt_add_to_reference_headers (ENVELOPE * env, ENVELOPE * curenv,
string_list_t *** pp, string_list_t *** qq)
{
void mutt_add_to_reference_headers (ENVELOPE * env, ENVELOPE * curenv,
string_list_t *** pp, string_list_t *** qq)
{
@@
-925,7
+920,7
@@
void mutt_set_followup_to (ENVELOPE * e)
}
}
}
}
-
e->mail_followup_to = mutt_remove_duplicates(
e->mail_followup_to);
+
address_list_uniq(&
e->mail_followup_to);
}
}
}
}