projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Let ncurses deal with that properly.
[apps/madmutt.git]
/
remailer.c
diff --git
a/remailer.c
b/remailer.c
index
2971a50
..
137e5a4
100644
(file)
--- a/
remailer.c
+++ b/
remailer.c
@@
-24,8
+24,6
@@
#define SW (option(OPTMBOXPANE)?SidebarWidth:0)
#define SW (option(OPTMBOXPANE)?SidebarWidth:0)
-#ifdef MIXMASTER
-
#define MIX_CAP_COMPRESS (1 << 0)
#define MIX_CAP_MIDDLEMAN (1 << 1)
#define MIX_CAP_NEWSPOST (1 << 2)
#define MIX_CAP_COMPRESS (1 << 0)
#define MIX_CAP_MIDDLEMAN (1 << 1)
#define MIX_CAP_NEWSPOST (1 << 2)
@@
-342,17
+340,13
@@
static const char *mix_format_caps (remailer_t * r)
* %a address
*
*/
* %a address
*
*/
-static const char *mix_entry_fmt (char *dest,
- ssize_t destlen,
- char op,
- const char *src,
- const char *prefix,
- const char *ifstring,
- const char *elsestring,
- unsigned long data, format_flag flags)
+static const char *
+mix_entry_fmt (char *dest, ssize_t destlen, char op, const char *src,
+ const char *prefix, const char *ifstr,
+ const char *elstr, anytype data, format_flag flags)
{
char fmt[16];
{
char fmt[16];
- remailer_t *remailer =
(remailer_t *) data
;
+ remailer_t *remailer =
data.ptr
;
int optional = (flags & M_FORMAT_OPTIONAL);
switch (op) {
int optional = (flags & M_FORMAT_OPTIONAL);
switch (op) {
@@
-389,10
+383,9
@@
static const char *mix_entry_fmt (char *dest,
*dest = '\0';
}
*dest = '\0';
}
- if (optional)
- mutt_FormatString (dest, destlen, ifstring, mutt_attach_fmt, data, 0);
- else if (flags & M_FORMAT_OPTIONAL)
- mutt_FormatString (dest, destlen, elsestring, mutt_attach_fmt, data, 0);
+ if (flags & M_FORMAT_OPTIONAL)
+ m_strformat(dest, destlen, 0, optional ? ifstr : elstr,
+ mutt_attach_fmt, data, 0);
return (src);
}
return (src);
}
@@
-401,10
+394,9
@@
static const char *mix_entry_fmt (char *dest,
static void mix_entry (char *b, ssize_t blen, MUTTMENU * menu, int num)
{
remailer_t **type2_list = (remailer_t **) menu->data;
static void mix_entry (char *b, ssize_t blen, MUTTMENU * menu, int num)
{
remailer_t **type2_list = (remailer_t **) menu->data;
- int w = (COLS-SW) > blen ? blen : (COLS-SW);
- m
utt_FormatString (b, w, NONULL (MixEntryFormat)
, mix_entry_fmt,
-
(unsigned long) type2_list[num], M_FORMAT_ARROWCURSOR
);
+ m
_strformat(b, blen, COLS - SW, MixEntryFormat
, mix_entry_fmt,
+
type2_list[num], 0
);
}
static int mix_chain_add (mixchain_t * chain, const char *s,
}
static int mix_chain_add (mixchain_t * chain, const char *s,
@@
-435,16
+427,6
@@
static int mix_chain_add (mixchain_t * chain, const char *s,
return 0;
}
return 0;
}
-static struct mapping_t RemailerHelp[] = {
- {N_("Append"), OP_MIX_APPEND},
- {N_("Insert"), OP_MIX_INSERT},
- {N_("Delete"), OP_MIX_DELETE},
- {N_("Abort"), OP_EXIT},
- {N_("OK"), OP_MIX_USE},
- {NULL, OP_NULL}
-};
-
-
void mix_make_chain (string_list_t ** chainp, int *redraw)
{
string_list_t *p;
void mix_make_chain (string_list_t ** chainp, int *redraw)
{
string_list_t *p;
@@
-459,7
+441,6
@@
void mix_make_chain (string_list_t ** chainp, int *redraw)
struct coord *coords = NULL;
MUTTMENU *menu;
struct coord *coords = NULL;
MUTTMENU *menu;
- char helpstr[SHORT_STRING];
short loop = 1;
int op;
short loop = 1;
int op;
@@
-495,8
+476,6
@@
void mix_make_chain (string_list_t ** chainp, int *redraw)
menu->tag = NULL;
menu->title = _("Select a remailer chain.");
menu->data = type2_list;
menu->tag = NULL;
menu->title = _("Select a remailer chain.");
menu->data = type2_list;
- menu->help =
- mutt_compile_help (helpstr, sizeof (helpstr), MENU_MIX, RemailerHelp);
m_len = menu->pagelen = MIX_VOFFSET - menu->offset - 1;
m_len = menu->pagelen = MIX_VOFFSET - menu->offset - 1;
@@
-674,17
+653,16
@@
int mix_check_message (HEADER * msg)
if (need_hostname) {
if (need_hostname) {
- if (!(fqdn = mutt_fqdn
(1))) {
+ if (!(fqdn = mutt_fqdn(1))) {
mutt_error
mutt_error
- _
- ("Please set the hostname variable to a proper value when using mixmaster!");
- return (-1);
+ _("Please set the hostname variable to a proper value when using mixmaster!");
+ return -1;
}
/* Cc and Bcc are empty at this point. */
}
/* Cc and Bcc are empty at this point. */
- rfc822_qualify
(msg->env->to, fqdn);
- rfc822_qualify
(msg->env->reply_to, fqdn);
- rfc822_qualify
(msg->env->mail_followup_to, fqdn);
+ rfc822_qualify(msg->env->to, fqdn);
+ rfc822_qualify(msg->env->reply_to, fqdn);
+ rfc822_qualify(msg->env->mail_followup_to, fqdn);
}
return 0;
}
return 0;
@@
-720,5
+698,3
@@
int mix_send_message (string_list_t * chain, const char *tempfile)
return i;
}
return i;
}
-
-#endif