projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Simplify charset.cpkg a bit
[apps/madmutt.git]
/
lib-crypt
/
pgpkey.c
diff --git
a/lib-crypt/pgpkey.c
b/lib-crypt/pgpkey.c
index
87dee7d
..
96db58a
100644
(file)
--- a/
lib-crypt/pgpkey.c
+++ b/
lib-crypt/pgpkey.c
@@
-236,7
+236,7
@@
pgp_entry_fmt (char *dest, ssize_t destlen, char op,
}
if (flags & M_FORMAT_OPTIONAL)
}
if (flags & M_FORMAT_OPTIONAL)
- m_strformat(dest, destlen, optional ? ifstr : elstr,
+ m_strformat(dest, destlen,
0,
optional ? ifstr : elstr,
mutt_attach_fmt, data, 0);
return src;
}
mutt_attach_fmt, data, 0);
return src;
}
@@
-249,7
+249,7
@@
static void pgp_entry (char *s, ssize_t l, MUTTMENU * menu, int num)
entry.uid = KeyTable[num];
entry.num = num + 1;
entry.uid = KeyTable[num];
entry.num = num + 1;
- m_strformat(s, l, PgpEntryFormat, pgp_entry_fmt, &entry,
+ m_strformat(s, l,
COLS - SW,
PgpEntryFormat, pgp_entry_fmt, &entry,
option(OPTARROWCURSOR) ? M_FORMAT_ARROWCURSOR : 0);
}
option(OPTARROWCURSOR) ? M_FORMAT_ARROWCURSOR : 0);
}
@@
-505,7
+505,7
@@
static pgp_key_t pgp_select_key (pgp_key_t keys, address_t * p, const char *s)
break;
}
break;
}
- fp = m_tempfile (tempfile, sizeof(tempfile), NONULL(
Te
mpdir), NULL);
+ fp = m_tempfile (tempfile, sizeof(tempfile), NONULL(
MCore.t
mpdir), NULL);
if (!fp) {
m_fclose(&devnull);
mutt_perror (_("Can't create temporary file"));
if (!fp) {
m_fclose(&devnull);
mutt_perror (_("Can't create temporary file"));
@@
-682,7
+682,7
@@
BODY *pgp_make_key_attachment (char *tempf)
pgp_free_key (&key);
if (!tempf) {
pgp_free_key (&key);
if (!tempf) {
- tempfp = m_tempfile (tempfb, sizeof(tempfb), NONULL(
Te
mpdir), NULL);
+ tempfp = m_tempfile (tempfb, sizeof(tempfb), NONULL(
MCore.t
mpdir), NULL);
tempf = tempfb;
} else {
tempfp = safe_fopen(tempf, "a");
tempf = tempfb;
} else {
tempfp = safe_fopen(tempf, "a");