projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix empty inline GPG messages: Enable LFS so that madmutt can communicate
[apps/madmutt.git]
/
crypt.cpkg
diff --git
a/crypt.cpkg
b/crypt.cpkg
index
ae29cd2
..
797a4b6
100644
(file)
--- a/
crypt.cpkg
+++ b/
crypt.cpkg
@@
-17,7
+17,6
@@
#include <lib-mime/mime.h>
#include <lib-ui/lib-ui.h>
#include <lib-mime/mime.h>
#include <lib-ui/lib-ui.h>
-#include <lib-ui/enter.h>
#include <lib-ui/menu.h>
#include <lib-mx/mx.h>
#include <lib-ui/menu.h>
#include <lib-mx/mx.h>
@@
-327,7
+326,7
@@
static gpgme_ctx_t create_gpgme_context(int for_smime)
if (err) {
mutt_error(_("error creating gpgme context: %s\n"),
gpgme_strerror(err));
if (err) {
mutt_error(_("error creating gpgme context: %s\n"),
gpgme_strerror(err));
- sleep(2);
+
mutt_
sleep(2);
mutt_exit(1);
}
if (!for_smime)
mutt_exit(1);
}
if (!for_smime)
@@
-336,7
+335,7
@@
static gpgme_ctx_t create_gpgme_context(int for_smime)
err = gpgme_set_protocol(ctx, GPGME_PROTOCOL_CMS);
if (err) {
mutt_error(_("error enabling CMS protocol: %s\n"), gpgme_strerror(err));
err = gpgme_set_protocol(ctx, GPGME_PROTOCOL_CMS);
if (err) {
mutt_error(_("error enabling CMS protocol: %s\n"), gpgme_strerror(err));
- sleep(2);
+
mutt_
sleep(2);
mutt_exit(1);
}
return ctx;
mutt_exit(1);
}
return ctx;
@@
-353,7
+352,7
@@
static gpgme_data_t create_gpgme_data(void)
if (err) {
mutt_error(_("error creating gpgme data object: %s\n"),
gpgme_strerror(err));
if (err) {
mutt_error(_("error creating gpgme data object: %s\n"),
gpgme_strerror(err));
- sleep(2);
+
mutt_
sleep(2);
mutt_exit(1);
}
return data;
mutt_exit(1);
}
return data;
@@
-2268,8
+2267,8
@@
static void crypt_entry (char *s, ssize_t l, MUTTMENU * menu, int num)
entry.key = cryptkey_table[num];
entry.num = num + 1;
entry.key = cryptkey_table[num];
entry.num = num + 1;
- m_strformat(s, l,
COLS - SW, mod_crypt.pgp_entry_format, crypt_entry_fm
t,
- &entry, 0);
+ m_strformat(s, l,
getmaxx(main_w), mod_crypt.pgp_entry_forma
t,
+
crypt_entry_fmt,
&entry, 0);
}
/* Compare two addresses and the keyid to be used for sorting. */
}
/* Compare two addresses and the keyid to be used for sorting. */