projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
the ‘kids don't do this at home’ commit.
[apps/madmutt.git]
/
recvattach.c
diff --git
a/recvattach.c
b/recvattach.c
index
50d3601
..
8d94955
100644
(file)
--- a/
recvattach.c
+++ b/
recvattach.c
@@
-139,19
+139,18
@@
ATTACHPTR **mutt_gen_attach_list (BODY * m,
* %s = size
* %u = unlink
*/
* %s = size
* %u = unlink
*/
-const char *mutt_attach_fmt (char *dest,
- ssize_t destlen,
+const char *mutt_attach_fmt (char *dest, ssize_t destlen,
char op,
const char *src,
const char *prefix,
char op,
const char *src,
const char *prefix,
- const char *ifstr
ing
,
- const char *els
estring
,
-
unsigned long
data, format_flag flags)
+ const char *ifstr,
+ const char *els
tr
,
+
anytype
data, format_flag flags)
{
char fmt[16];
char tmp[STRING];
char charset[STRING];
{
char fmt[16];
char tmp[STRING];
char charset[STRING];
- ATTACHPTR *aptr =
(ATTACHPTR *) data
;
+ ATTACHPTR *aptr =
data.ptr
;
int optional = (flags & M_FORMAT_OPTIONAL);
ssize_t l;
int optional = (flags & M_FORMAT_OPTIONAL);
ssize_t l;
@@
-191,7
+190,7
@@
const char *mutt_attach_fmt (char *dest,
_mutt_make_string (s, sizeof (s), MsgFmt, NULL, aptr->content->hdr,
M_FORMAT_FORCESUBJ | M_FORMAT_MAKEPRINT |
_mutt_make_string (s, sizeof (s), MsgFmt, NULL, aptr->content->hdr,
M_FORMAT_FORCESUBJ | M_FORMAT_MAKEPRINT |
-
M_FORMAT_ARROWCURSOR
);
+
(option(OPTARROWCURSOR) ? M_FORMAT_ARROWCURSOR : 0)
);
if (*s) {
mutt_format_s (dest, destlen, prefix, s);
break;
if (*s) {
mutt_format_s (dest, destlen, prefix, s);
break;
@@
-313,9
+312,9
@@
const char *mutt_attach_fmt (char *dest,
}
if (optional)
}
if (optional)
- m_strformat (dest, destlen, ifstr
ing
, mutt_attach_fmt, data, 0);
+ m_strformat (dest, destlen, ifstr, mutt_attach_fmt, data, 0);
else if (flags & M_FORMAT_OPTIONAL)
else if (flags & M_FORMAT_OPTIONAL)
- m_strformat (dest, destlen, els
estring
, mutt_attach_fmt, data, 0);
+ m_strformat (dest, destlen, els
tr
, mutt_attach_fmt, data, 0);
return (src);
}
return (src);
}
@@
-323,8
+322,8
@@
static void attach_entry (char *b, ssize_t blen, MUTTMENU * menu, int num)
{
int w=(COLS-SW)>blen?blen:(COLS-SW);
m_strformat (b, w, NONULL (AttachFormat), mutt_attach_fmt,
{
int w=(COLS-SW)>blen?blen:(COLS-SW);
m_strformat (b, w, NONULL (AttachFormat), mutt_attach_fmt,
- (
unsigned long) (((ATTACHPTR **) menu->data)[num])
,
-
M_FORMAT_ARROWCURSOR
);
+ (
(ATTACHPTR **) menu->data)[num]
,
+
option(OPTARROWCURSOR) ? M_FORMAT_ARROWCURSOR : 0
);
}
int mutt_tag_attach (MUTTMENU * menu, int n, int m)
}
int mutt_tag_attach (MUTTMENU * menu, int n, int m)